Compare commits

...

2436 Commits

Author SHA1 Message Date
Carl Bergquist
69630b9bb7 Merge pull request #14024 from bergquist/cp_v5.3.x
Cherry picks for v5.3.4
2018-11-13 13:19:12 +01:00
Carl Bergquist
802387ec23 Merge branch 'v5.3.x' into cp_v5.3.x 2018-11-13 13:05:53 +01:00
Carl Bergquist
77cd62d547 Merge pull request #14049 from bergquist/cp_v5.3.3
Cherry-pick for v5.3.3
2018-11-13 12:51:05 +01:00
bergquist
b7facc390d Merge branch 'private_v5.3.x' into cp_v5.3.3
* private_v5.3.x:
  release 5.3.3
2018-11-13 10:53:53 +01:00
bergquist
a7c82192ab release 5.3.4 2018-11-12 11:53:41 +01:00
Augustin Husson
82bf655ec1 don't drop the value when it equals to None
(cherry picked from commit 2abf8a0e8b)
2018-11-12 11:51:30 +01:00
Julien Pivotto
a23780ddf0 Remove Origin and Referer headers while proxying requests
Fix #13949
Fix #13328

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
(cherry picked from commit 62417ca69f)
2018-11-12 11:51:12 +01:00
Dan Cech
7a8e246349 add auth.proxy headers to sample.ini
(cherry picked from commit 8a74fe2b76)
2018-11-12 11:48:41 +01:00
Dan Cech
16517b3040 add auth.proxy headers to default.ini
(cherry picked from commit 502290817a)
2018-11-12 11:48:41 +01:00
Torkel Ödegaard
43e78db0f6 fixed exporter bug missing adding requires for datasources only used via data source variable, fixes #13891
(cherry picked from commit 99610e040f)
2018-11-12 11:48:41 +01:00
bergquist
4fa671acc1 rename and mark functions as private
(cherry picked from commit 7bde98aff9)
2018-11-12 11:47:52 +01:00
bergquist
50efe02b22 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

(cherry picked from commit 17adb58d80)
2018-11-12 11:47:52 +01:00
bergquist
3ca0ab6d89 Revert "bump version to 5.3.3"
This reverts commit 617e69d411.
2018-11-06 16:58:15 +01:00
bergquist
a8aa16673e release 5.3.3 2018-11-06 16:49:03 +01:00
Carl Bergquist
fd8f22ca57 Merge pull request #13979 from bergquist/cp_v5.3.3
Cherry-picks for 5.3.3
2018-11-06 15:30:30 +01:00
bergquist
617e69d411 bump version to 5.3.3 2018-11-06 15:09:48 +01:00
Marcus Efraimsson
738db3319e fix selecting datasource using enter key
(cherry picked from commit e5e886ccb7)
2018-11-06 15:07:38 +01:00
bergquist
2d23704082 alerting: delete alerts when parent folder is deleted
closes #13322

(cherry picked from commit 423331dae0)
2018-11-06 15:07:13 +01:00
Torkel Ödegaard
c7736c0b7d IE11 fix for legend tables below graph
(cherry picked from commit d46c258933)
2018-11-06 15:06:48 +01:00
Marcus Efraimsson
eeb4d08031 mysql: fix timeFilter macro should respect local time zone
(cherry picked from commit 97b22aa5a9)
2018-11-06 15:06:05 +01:00
Marcus Efraimsson
0d821d07ad Merge pull request #13807 from bergquist/cp_v5.3.x
Cherry-pick commit for 5.3.2
2018-10-24 14:06:27 +02:00
bergquist
f7092fa6b0 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

(cherry picked from commit 0a9bfc5529)
2018-10-24 13:57:19 +02:00
Marcus Efraimsson
9ca86f1b0e Merge pull request #13790 from grafana/cp-5.3.2
Cherry picks for v5.3.2
2018-10-24 13:43:58 +02:00
Marcus Efraimsson
dc70298210 release 5.3.2 2018-10-24 13:27:02 +02:00
Erik Sundell
d20c7260b3 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

(cherry picked from commit c5af0bf1c5)
2018-10-24 13:26:14 +02:00
Johannes Schill
a54fa3858e Move the variable regex to constants to make sure we use the same reg… (#13801)
(cherry picked from commit 38c155403e)
2018-10-24 12:09:46 +02:00
Torkel Ödegaard
7be0716752 fix: another fix for #13764 , #13793
(cherry picked from commit 53d9619cb9)
2018-10-24 09:05:04 +02:00
Torkel Ödegaard
cb1eedb5f7 fix: kiosk url fix, fixes #13764
(cherry picked from commit 8a1e0cd83b)
2018-10-24 09:04:44 +02:00
Leonard Gram
0d8c7573f3 docker: adds curl back into the docker image for utility. (#13794)
(cherry picked from commit 4cc89f1753)
2018-10-23 16:16:57 +02:00
Adam Palaniuk
c9591f8a8c Update check for invalid percentile statistics
(cherry picked from commit 58a156ba03)
2018-10-23 14:20:10 +02:00
Johannes Schill
6c3202b1b6 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

(cherry picked from commit 22a0f3cf94)
2018-10-23 14:07:04 +02:00
Marcus Efraimsson
5daf842431 add debug logging of folder/dashbord permission checks
(cherry picked from commit b371f2d91f)
2018-10-23 11:51:05 +02:00
Erik Sundell
487a8585c6 stackdriver: only add unit to resonse obj if it has a value
(cherry picked from commit b2932058c7)
2018-10-23 11:20:35 +02:00
Erik Sundell
20a47ed3d6 stackdriver: fix failing tests
(cherry picked from commit 0f0763b6b8)
2018-10-23 11:20:27 +02:00
Erik Sundell
72e60346bc stackdriver: make sure unit is not returned to the panel if mapping from stackdriver unit to grafana unit can't be made
(cherry picked from commit d1740f090a)
2018-10-23 11:20:19 +02:00
Mitsuhiro Tanda
f213f664ce allow unit override if cloudwatch response unit is none
(cherry picked from commit 4687ce2f7b)
2018-10-23 11:20:10 +02:00
Mitsuhiro Tanda
5b9116bf80 Revert "don't overwrite unit if user set"
This reverts commit 9dd33b79e037fc75ddc5f3a6b294edba99e99b94.

(cherry picked from commit e465b2d53a)
2018-10-23 11:19:32 +02:00
Mitsuhiro Tanda
3891b82443 don't overwrite unit if user set
(cherry picked from commit 287ba77abf)
2018-10-23 11:19:24 +02:00
Sven Klemm
7ddccdba08 Fix variable highlighting
(cherry picked from commit 2803cdca40)
2018-10-23 11:18:50 +02:00
Sven Klemm
02b4cf392d Escape typeahead values in query_part
(cherry picked from commit 20c1a58488)
2018-10-23 11:18:43 +02:00
Sven Klemm
112fa2b8b9 Escape values in metric segment and sql part
(cherry picked from commit 3a25a0de83)
2018-10-23 11:18:34 +02:00
Adrien Fillon
e8e8b014f6 fix LDAP Grafana admin logic
Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com>
Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com>
(cherry picked from commit 781e66ba3c)
2018-10-23 11:18:04 +02:00
Mitsuhiro Tanda
02a3e11708 fix concurrent map writes
(cherry picked from commit 48aef0c50e)
2018-10-23 11:17:39 +02:00
Marcus Efraimsson
b0f91f3a3e postgres: use arrow function declaration of interpolateVariable
(cherry picked from commit 7b656097a7)
2018-10-23 11:17:07 +02:00
Sven Klemm
99a8bf2195 Use closure for calling interpolateVariable
(cherry picked from commit ec0fd96f08)
2018-10-23 11:16:58 +02:00
Marcus Efraimsson
08c7908db5 Merge pull request #13673 from grafana/cp-5.3.1
Cherry-picks for v5.3.1
2018-10-16 11:54:53 +02:00
Marcus Efraimsson
73f2fb439d release 5.3.1 2018-10-16 11:30:42 +02:00
Yuan Liu
c507319f75 add test for es alert when group by has no limit
(cherry picked from commit 18dfdc4f0d)
2018-10-16 01:20:23 +02:00
Yuan Liu
5c38d3e9b0 remove tab
(cherry picked from commit f8a8b213f9)
2018-10-16 01:20:13 +02:00
Yuan Liu
1bc344447c bug fix
bug fix
(cherry picked from commit 567db87c3a)
2018-10-16 01:19:59 +02:00
Yuan Liu
ac6bd22fd4 Update time_series_query.go
fix alert no data when elasticsearch group by terms size is set to no limit
(cherry picked from commit 3b9ab6e204)
2018-10-16 01:19:41 +02:00
Torkel Ödegaard
8696b27c09 fix for influxdb annotation issue that caused text to be shown twice, fixes #13553
(cherry picked from commit 67f5bb2c4e)
2018-10-16 01:17:43 +02:00
Jordan Neufeld
22880a75df Fix text overflow on playlist search #13464
(cherry picked from commit 4815f92f6f)
2018-10-16 01:17:13 +02:00
Leonard Gram
06dc70699b build: makes sure publisher.sh is available when deploying.
(cherry picked from commit 6fd3430677)
2018-10-15 14:56:54 +02:00
Torkel Ödegaard
2fd66c3b28 fix for graph time formating for Last 24h ranges, fixes #13650
(cherry picked from commit 551e0843fa)
2018-10-15 13:58:44 +02:00
olshansky
6f5d1fff75 fix: label values regex for single letter labels
Closes: #13641
(cherry picked from commit 91e201ffa8)
2018-10-15 13:58:19 +02:00
Marcus Efraimsson
0082bb0dbc make sure to add all variable nodes to dag before linking variables
(cherry picked from commit 4b1a2d3b11)
2018-10-15 13:57:11 +02:00
Erik Sundell
19df00e2d4 stackdriver: check if array is empty to prevent filter from crashing. This closes #13607
(cherry picked from commit c84cf1f598)
2018-10-15 13:56:42 +02:00
Marcus Efraimsson
2af0292329 fix phantomjs render of graph panel when legend as table to the right
(cherry picked from commit fc79ba30ae)
2018-10-15 13:50:54 +02:00
Marcus Efraimsson
183bb1785b fix /api/org/users so that query and limit querystrings works
(cherry picked from commit c0b7ca3902)
2018-10-15 13:49:19 +02:00
Carl Bergquist
c613a317a1 Merge pull request #13589 from grafana/cp_v5.3.0
Cherry-picks for v5.3.0 stable
2018-10-10 12:20:21 +02:00
Torkel Ödegaard
8d01075223 fix: minor ux fixes in v5.3 2018-10-10 12:00:55 +02:00
Mitsuhiro Tanda
4e2607b8e7 fix id validation
(cherry picked from commit 6e32c9bb3f)
2018-10-10 11:57:37 +02:00
bergquist
6611aefea4 release 5.3.0 2018-10-10 10:54:47 +02:00
Marcus Efraimsson
04ba06ccad cloudwatch: return early if execute query returns error
This will stop a segfault from happening

(cherry picked from commit 0612ce9b75)
2018-10-10 10:50:16 +02:00
Mitsuhiro Tanda
002da27e98 add test for automatically unit set
(cherry picked from commit f0fb8123ae)
2018-10-10 10:50:16 +02:00
Mitsuhiro Tanda
55712d61f4 fix crach bug
(cherry picked from commit 37e749f6da)
2018-10-10 10:50:16 +02:00
Mitsuhiro Tanda
cc57377f03 set unit for CloudWatch GetMetricStatistics result
(cherry picked from commit 6ed1cbd5bb)
2018-10-10 10:50:16 +02:00
Daniel Lee
5250c84ca7 stackdriver metric name fix. Fixes #13562
Sets metric name even when the metric does not have a displayName field. Closes #13562.

(cherry picked from commit 6fce178ec7)
2018-10-10 10:42:35 +02:00
Erik Sundell
b67e69bc52 stackdriver: improve filter docs for wildcards and regular expressions
(cherry picked from commit 11b9f9691c)
2018-10-10 10:39:07 +02:00
Erik Sundell
0d0df00b8e stackdriver: always use regex full match for =~ and !=~operator
(cherry picked from commit 8d53799bcd)
2018-10-10 10:39:07 +02:00
Erik Sundell
25f255f560 stackdriver: add tests from regex matching
(cherry picked from commit 7e6a5c0a74)
2018-10-10 10:39:07 +02:00
Erik Sundell
a109c53cea stackdriver: always use regex full match for =~ and !=~operator
(cherry picked from commit 46ca306c2f)
2018-10-10 10:39:07 +02:00
Erik Sundell
322535a2b7 stackdriver: test build filter string
(cherry picked from commit a3122a4b85)
2018-10-10 10:39:07 +02:00
Erik Sundell
93fb427310 stackdriver: test that no interpolation is done when there are no wildcards
(cherry picked from commit 5f7795aa1f)
2018-10-10 10:39:07 +02:00
Erik Sundell
84094b5051 stackdriver: remove debug logging
(cherry picked from commit 2a0d7a8803)
2018-10-10 10:39:06 +02:00
Erik Sundell
0ef06d467a stackdriver: add more tests
(cherry picked from commit 035be6cbbe)
2018-10-10 10:39:06 +02:00
Erik Sundell
dee26f3d2f stackdriver: fix broken substring. also adds tests
(cherry picked from commit 68332c5951)
2018-10-10 10:39:06 +02:00
Erik Sundell
897cf51e75 stackdriver: remove not necessary helper functions
(cherry picked from commit 2e665fba0f)
2018-10-10 10:39:06 +02:00
Erik Sundell
a4e148e300 stackdriver: interpolate stackdriver filter wildcards when asterix is used in filter
(cherry picked from commit 4d8f594d31)
2018-10-10 10:39:06 +02:00
Torkel Ödegaard
56c32963d6 ux: minor update to look of stackdriver query help
(cherry picked from commit 3fa83d2755)
2018-10-10 10:34:24 +02:00
Mitsuhiro Tanda
221341b3e8 add test
(cherry picked from commit c2c0cdb49c)
2018-10-10 10:33:25 +02:00
Mitsuhiro Tanda
464e0cf540 stackdriver heatmap support
(cherry picked from commit 6770f2e940)
2018-10-10 10:33:14 +02:00
bergquist
d275ea05a5 build: fix for invalid pathing for release publisher
(cherry picked from commit 96a0c9c56d)
2018-10-03 16:54:42 +02:00
Carl Bergquist
69b4bf8125 Merge pull request #13510 from bergquist/cp_v5.3.x
Cherry-pick 5.3.0-beta3 fixes
2018-10-03 16:06:49 +02:00
Daniel Lee
62f85c3772 stackdriver: adds missing nginject attribute
(cherry picked from commit 6d8a3ce1a3)
2018-10-03 15:26:57 +02:00
bergquist
2e0165e80a release v5.3.0-beta3 2018-10-03 14:22:28 +02:00
Johannes Schill
272840e0cb Fix issue with updating role permissions #13507
(cherry picked from commit 97802f30ae)
2018-10-03 14:20:30 +02:00
bergquist
694c738b6d build: automatically publish releases to grafana.com.
(cherry picked from commit add6cee742)
2018-10-03 14:19:02 +02:00
Marcus Efraimsson
a493a773a2 Merge branch 'master' into v5.3.x 2018-10-02 16:03:30 +02:00
Marcus Efraimsson
9af809ff8a Merge pull request #13440 from grafana/reminder_refactoring
Transaction issues for alert reminder
2018-10-02 15:55:18 +02:00
David
321c09aec4 Merge pull request #13416 from grafana/davkal/11999-explore-from-mixed-panels
Explore: jump to explore from panels with mixed datasources
2018-10-02 15:42:43 +02:00
Marcus Efraimsson
0e0901874b better comment about state changes 2018-10-02 15:11:33 +02:00
Marcus Efraimsson
418f77e70e get or create alert notification should use transaction 2018-10-02 15:07:44 +02:00
bergquist
7b781e4c3c use notification state id instead of notifier id 2018-10-02 14:53:39 +02:00
bergquist
9289cba625 merges defaultShouldNotify and ShouldNotify 2018-10-02 14:28:48 +02:00
bergquist
67e5f62514 move version conflict logging for mark as complete to sqlstore package 2018-10-02 14:23:18 +02:00
bergquist
9d3659d30d improve local variable name 2018-10-02 14:04:50 +02:00
bergquist
b45a1bd45c avoid exporting notificationState and notificationStateSlice 2018-10-02 14:03:30 +02:00
bergquist
9022e871e3 avoid sending full notification state to pending/complete 2018-10-02 13:57:41 +02:00
bergquist
341d8af637 rename GetNotificationStateQuery to GetOrCreateNotificationStateQuery 2018-10-02 11:23:40 +02:00
bergquist
7f1d7cefc0 reminder: uses UpdatedAt to track state changes. 2018-10-02 11:19:09 +02:00
Carl Bergquist
9e09b2b969 Merge pull request #13477 from grafana/alert_rule_state_changes_version
use alert state changes counter for alert notification dedupping.
2018-10-02 10:18:27 +02:00
Torkel Ödegaard
f37a60dcd5 Merge branch 'data-sources-list-to-react' 2018-10-02 09:33:58 +02:00
Torkel Ödegaard
8fd1d8a057 changed from RFC to PureComponent 2018-10-02 09:27:02 +02:00
Carl Bergquist
8e9c0a44c3 Merge pull request #13470 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-10-01 23:14:14 +02:00
Marcus Efraimsson
35eddee2dd devenv: add postgres ha test config example 2018-10-01 19:40:03 +02:00
Marcus Efraimsson
505ae709c9 Merge pull request #13481 from leo8a/master
typo in sample.ini
2018-10-01 19:31:56 +02:00
Leo Ochoa
12a99fa0b5 typo in sample.ini 2018-10-01 18:47:25 +02:00
Marcus Efraimsson
4ce8cc77e4 Merge pull request #13480 from ArcticSnowman/master
Update to ldap.md
2018-10-01 18:42:45 +02:00
Mario Trangoni
6c190ab713 pkg/tsdb/cloudwatch/credentials.go: Remove unnecessary variable assignment
See,
pkg/tsdb/cloudwatch/credentials.go:45:2⚠️ should merge variable declaration with assignment on next line (S1021) (megacheck)
2018-10-01 18:24:00 +02:00
Mario Trangoni
236e0b3814 pkg/cmd/grafana-server/main.go: '_ = <-ch' simplified to '<-ch'
See,
pkg/cmd/grafana-server/main.go:107:8⚠️ '_ = <-ch' can be simplified to '<-ch' (S1005) (megacheck)
2018-10-01 18:24:00 +02:00
Mario Trangoni
ec4139d56b pkg/tsdb/stackdriver/stackdriver_test.go: return simplified
See,
pkg/tsdb/stackdriver/stackdriver_test.go:356:2⚠️ 'if err != nil { return data, err }; return data, nil' can be simplified to 'return data, err'
2018-10-01 18:24:00 +02:00
Mario Trangoni
dde650905d Fix megacheck issue unused code.
I removed some code, and commented out other one.

See,
$ gometalinter --vendor --disable-all --disable=gotype --enable=megacheck --deadline 6m ./... | grep unused
pkg/api/avatar/avatar.go:100:26⚠️ func (*CacheServer).mustInt is unused (U1000) (megacheck)
pkg/api/folder_test.go:136:6⚠️ func callGetFolderByUID is unused (U1000) (megacheck)
pkg/api/folder_test.go:141:6⚠️ func callDeleteFolder is unused (U1000) (megacheck)
pkg/api/live/hub.go:40:15⚠️ func (*hub).removeConnection is unused (U1000) (megacheck)
pkg/components/imguploader/azureblobuploader.go:130:5⚠️ var client is unused (U1000) (megacheck)
pkg/middleware/middleware_test.go:438:28⚠️ func (*scenarioContext).withInvalidApiKey is unused (U1000) (megacheck)
pkg/services/alerting/ticker.go:40:18⚠️ func (*Ticker).updateOffset is unused (U1000) (megacheck)
pkg/services/notifications/notifications_test.go:12:6⚠️ type testTriggeredAlert is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:935:6⚠️ type scenarioContext is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:939:6⚠️ type scenarioFunc is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:941:6⚠️ func dashboardGuardianScenario is unused (U1000) (megacheck)
pkg/services/sqlstore/transactions_test.go:13:6⚠️ type testQuery is unused (U1000) (megacheck)
2018-10-01 18:23:59 +02:00
Steven Arnott
043d5f1c05 Update ldap.md 2018-10-01 11:41:19 -04:00
Marcus Efraimsson
a4f5aafe22 Merge pull request #13422 from grafana/1815_admin_reset
cli: fix reset-admin-password
2018-10-01 16:48:32 +02:00
bergquist
75f832cda8 use alert state changes counter as secondary version 2018-10-01 15:58:30 +02:00
Leonard Gram
b29ac5c509 docs: stackdriver version notice. 2018-10-01 14:35:20 +02:00
Leonard Gram
28a9caa34d Update CHANGELOG.md 2018-10-01 13:45:34 +02:00
David Kaltschmidt
68dfc5699b Moved explore helpers to utils/explore 2018-10-01 12:56:26 +02:00
Torkel Ödegaard
c6f7ae4e02 Merge pull request #13472 from grafana/v5.3.0-beta2
V5.3.0 beta2
2018-10-01 12:12:21 +02:00
David Kaltschmidt
54c9beb146 Explore: jump to explore from panels with mixed datasources
- extends handlers for panel menu and keypress 'x'
- in a mixed-datasource panel finds first datasource that supports
  explore and collects its targets
- passes those targets to the found datasource to be serialized for
  explore state
- removed `supportMetrics` and `supportsExplore`
- use datasource metadata instead (set in plugin.json)
- Use angular timeout to wrap url change for explore jump
- Extract getExploreUrl into core/utils/explore
2018-10-01 12:03:57 +02:00
Leonard Gram
a049b22cb0 release v5.3.0-beta2. 2018-10-01 11:40:43 +02:00
Leonard Gram
c026e6f320 Merge remote-tracking branch 'origin/master' into v5.3.0-beta2
* origin/master: (397 commits)
  stackdriver: set default view parameter to FULL
  stackdriver: no tags for annotations (yet)
  stackdriver: add help section for annotations
  stackdriver: revert an accidental commit for text template variable
  Added test for url state in Explore
  Make Explore a pure component
  stackdriver: remove metric.category alias pattern
  stackdriver: remove commented code
  stackdriver: unit test group by and aggregation dropdown changes
  stackdriver: make it impossible to select no aggregation when a group by is selected
  Explore: Store UI state in URL
  stackdriver: add relevant error message for when a user tries to create a template variable
  stackdriver: make sure labels are loaded when service is changed in dropdown
  stackdriver: change info logging to debug logging
  stackdriver: change pattern for annotation to metric.value
  stackdriver: add support for bool values
  stackdriver: add support for int64 values
  stackdriver: use correct default value for alignment period
  stackdriver: fix reducer names
  stackdriver: fix froamt annotation text for value
  ...
2018-10-01 11:20:52 +02:00
David
7b543ca4b5 Merge pull request #13463 from grafana/davkal/explore-url-state
Explore: Store UI state in URL
2018-10-01 10:09:15 +02:00
Torkel Ödegaard
c0996e7a39 Merge pull request #13444 from grafana/13411-react-api-key
13411 react api key
2018-10-01 09:46:18 +02:00
Marcus Efraimsson
1be8fb76b8 cleanup alert_notification_state when deleting alert rules and channels 2018-09-30 21:57:15 +02:00
Marcus Efraimsson
5ec086dc56 don't notify if notification state pending
If notification state is pending and last update of state was made
less than a minute ago. In the case of a grafana instance is shut down/crashes
between setting pending state and before sending the notification/marks as complete
this logic should allow the notification to be sent after some time instead of
being left in an inconsistent state where no notifications are being sent.
2018-09-30 21:52:50 +02:00
Marcus Efraimsson
d412aafb7e remove unused code 2018-09-30 20:16:01 +02:00
Daniel Lee
bf2abc6940 stackdriver: set default view parameter to FULL 2018-09-29 23:45:28 +02:00
Daniel Lee
9c2bca411c Merge pull request #13289 from grafana/stackdriver-plugin
Stackdriver Datasource - Fixes #6733
2018-09-28 19:36:01 +02:00
Daniel Lee
cf0189ab1a stackdriver: no tags for annotations (yet)
fixes glitch where an empty tag shows up
2018-09-28 19:17:34 +02:00
Daniel Lee
296fd35d47 stackdriver: add help section for annotations 2018-09-28 19:12:50 +02:00
Marcus Efraimsson
d313ffa847 devenv: enable some debug logging for ha test setup 2018-09-28 18:35:43 +02:00
Marcus Efraimsson
8551ffa0b0 alert -> ok with reminders enabled should send 2018-09-28 18:34:20 +02:00
Daniel Lee
a1f486bbfa stackdriver: revert an accidental commit for text template variable
with dummy change in readme to be able to make a commit
2018-09-28 18:19:57 +02:00
David
b2758b2ad0 Merge pull request #13408 from grafana/limit-number-of-series-in-explore
Limit number of time series in explore
2018-09-28 17:45:33 +02:00
David Kaltschmidt
12c43d6436 Added test for url state in Explore 2018-09-28 17:39:53 +02:00
David Kaltschmidt
c3e0d4205c Make Explore a pure component 2018-09-28 17:38:50 +02:00
Daniel Lee
399e83f91b stackdriver: remove metric.category alias pattern
After discussions with the Stackdriver team, they did not think this was
needed.
2018-09-28 17:16:35 +02:00
Erik Sundell
a25389332c stackdriver: remove commented code 2018-09-28 17:11:06 +02:00
Erik Sundell
db8bbe3cad stackdriver: unit test group by and aggregation dropdown changes 2018-09-28 17:06:24 +02:00
Erik Sundell
3572692fd5 stackdriver: make it impossible to select no aggregation when a group by is selected 2018-09-28 16:55:39 +02:00
David Kaltschmidt
200784ea4a Explore: Store UI state in URL
Storing queries, split state, and time range in URL.

- harmonize query serialization when generating Explore URLs in
  dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
2018-09-28 16:44:07 +02:00
Erik Sundell
cdcb14f3e6 Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-28 16:37:11 +02:00
Erik Sundell
fc1e214987 stackdriver: add relevant error message for when a user tries to create a template variable 2018-09-28 16:36:43 +02:00
Daniel Lee
aedd518186 Merge remote-tracking branch 'origin/stackdriver-plugin' into stackdriver-plugin 2018-09-28 16:34:28 +02:00
Erik Sundell
9748a9487b stackdriver: merge commit" 2018-09-28 16:21:54 +02:00
Daniel Lee
9b90b835b2 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-28 16:20:40 +02:00
Erik Sundell
31ddcdb37e stackdriver: make sure labels are loaded when service is changed in dropdown 2018-09-28 16:20:16 +02:00
Daniel Lee
d11f67eb25 stackdriver: change info logging to debug logging 2018-09-28 16:16:27 +02:00
Daniel Lee
41060d24d5 stackdriver: change pattern for annotation to metric.value 2018-09-28 16:16:27 +02:00
Erik Sundell
189f89a9e4 stackdriver: add support for bool values 2018-09-28 15:42:02 +02:00
Erik Sundell
220f479ff8 stackdriver: add support for int64 values 2018-09-28 15:27:28 +02:00
Erik Sundell
4abd04a5cf stackdriver: use correct default value for alignment period 2018-09-28 15:23:13 +02:00
Marcus Efraimsson
a0e1a1a1f9 Merge remote-tracking branch 'origin/master' into reminder_refactoring 2018-09-28 15:17:30 +02:00
Marcus Efraimsson
fda8a08e0b Merge pull request #13439 from grafana/ha_setup
Grafana high availability (ha) test setup
2018-09-28 15:16:47 +02:00
Erik Sundell
f384e577dd stackdriver: fix reducer names 2018-09-28 15:11:33 +02:00
Marcus Efraimsson
67c58fa5e4 fix set sent_at on complete 2018-09-28 15:11:03 +02:00
Marcus Efraimsson
c1763508e0 handle pending and completed state for alert notifications 2018-09-28 14:22:03 +02:00
Erik Sundell
2aae7e0c87 stackdriver: fix froamt annotation text for value 2018-09-28 13:50:10 +02:00
Erik Sundell
ca50e315fa stackdriver: make it possible to use point values of type string 2018-09-28 13:41:28 +02:00
Peter Holmberg
3081e0f84a Merge branch 'master' into 13411-react-api-key 2018-09-28 13:10:55 +02:00
Marcus Efraimsson
2bf399d3c8 No need to get alert notification state in ShouldNotify 2018-09-28 12:59:35 +02:00
Peter Holmberg
e50a87aec9 using constant 2018-09-28 12:58:01 +02:00
Peter Holmberg
7ae4076ddd added no datasources added 2018-09-28 11:29:18 +02:00
Erik Sundell
5bc6d857a7 stackdriver: broadcasting through $scope doesnt work anymore since query_filter_ctrl is now a sibling directive to query_aggregation_ctrl, so broadcasting is now done using $rootScope 2018-09-28 11:25:32 +02:00
Marcus Efraimsson
69cc24ea3f wip: test get alert notification state 2018-09-28 11:17:03 +02:00
Marcus Efraimsson
88bbc452a7 wip: send and mark as complete 2018-09-28 11:14:36 +02:00
Peter Holmberg
166f93cf54 components, test, removed old not used files 2018-09-28 11:05:34 +02:00
Leonard Gram
1a75aa54de wip: impl so that get alertstate also creates it if it does not exist 2018-09-28 10:48:08 +02:00
Torkel Ödegaard
abefadb333 fix: preloader element issue 2018-09-28 09:30:56 +02:00
Torkel Ödegaard
5eef2fe05b Merge pull request #13458 from skreii/master
Adding AWS Isolated Regions
2018-09-28 09:14:43 +02:00
Steve Kreitzer
55e4db5cfc Adding AWS Isolated Regions 2018-09-27 19:58:07 -04:00
bergquist
15ce474639 wip 2018-09-27 16:21:53 +02:00
Daniel Lee
a63877bd4f stackdriver: pattern formatting for annotations 2018-09-27 16:18:48 +02:00
Erik Sundell
9351b56e57 stackdriver: fix alignment period bug 2018-09-27 15:59:17 +02:00
Torkel Ödegaard
5eede26a24 Merge pull request #13438 from grafana/plugin-list-to-react
Plugin list to react
2018-09-27 15:50:55 +02:00
Erik Sundell
a028df658a stackdriver: set first metric as selected if no metric could be retrieved from the target 2018-09-27 15:42:01 +02:00
Torkel Ödegaard
8b4dbbe0bd Merge pull request #13448 from grafana/davkal/typecheck-precommit
Compile TS on precommit hook
2018-09-27 15:36:50 +02:00
Daniel Lee
03b43ab769 stackdriver: wip annotation support 2018-09-27 15:18:10 +02:00
David Kaltschmidt
88f36cbd22 Compile TS of the whole project to detect type errors
- was not covered by TS lint
- TS errors are only noticed in broken builds
- added grunt task to run `tsc --noEmit`
2018-09-27 15:15:41 +02:00
Erik Sundell
26d9e9243a stackdriver: resolve merge conflict 2018-09-27 15:14:01 +02:00
Erik Sundell
a3b0539754 stackdriver: update tests 2018-09-27 15:05:47 +02:00
Erik Sundell
81bdf86bf8 stackdriver: es6 style directive, avoid using scope 2018-09-27 15:05:26 +02:00
Torkel Ödegaard
5873a71324 Update CHANGELOG.md 2018-09-27 14:58:46 +02:00
Peter Holmberg
11ee65d35a deletez 2018-09-27 14:51:00 +02:00
Torkel Ödegaard
7d44aacf4a refactoring: slight changes to PR #13247 2018-09-27 14:50:14 +02:00
Peter Holmberg
b899a0e1c1 revert rename 2018-09-27 14:45:36 +02:00
Erik Sundell
8ae72bce07 stackdriver: fix typescript error 2018-09-27 14:45:15 +02:00
Erik Sundell
a7897575b9 stackdriver: remove not needed alignment option 2018-09-27 14:43:30 +02:00
Torkel Ödegaard
f2307f92de Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana into daldoyle-text_variable-3173 2018-09-27 14:36:37 +02:00
Peter Holmberg
327cdf34d5 using constant 2018-09-27 14:32:54 +02:00
Daniel Lee
ea1859a374 stackdriver: extract out filter, metric type directive 2018-09-27 14:31:39 +02:00
Erik Sundell
92f50ca384 stackdriver: add unit tests to resolve unit function 2018-09-27 14:24:28 +02:00
Peter Holmberg
fede5e6c74 rename to pluginlistitem 2018-09-27 14:23:46 +02:00
Peter Holmberg
cabc4c4bfe fixing types 2018-09-27 14:19:36 +02:00
Erik Sundell
251bb09aed stackdriver: convert most common stackdriver units to grafana units if possible 2018-09-27 14:03:52 +02:00
Torkel Ödegaard
92172566cb Merge pull request #13445 from grafana/explore-dark-theme-fixes
fixes to dark theme for Explore mode
2018-09-27 13:43:51 +02:00
Marcus Efraimsson
d093244282 sqlstore: add support for checking if error is constraint validation error 2018-09-27 13:38:22 +02:00
Peter Holmberg
1e2c06083a rewrote to use react.sfc 2018-09-27 12:15:41 +02:00
Torkel Ödegaard
5c24fa68a5 explore: fixes to dark theme, fixes #13349 2018-09-27 11:57:28 +02:00
Johannes Schill
362010c438 Remove angular code related to API Keys and point the route to the React component #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
c7fb6916b9 Open modal with API key information after key is added #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
a94662c8c7 Add tests for the reducers & selectors for API keys #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
32fb24f248 Update test-snapshot, remove dead code #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
60866d16b1 Add tests for ApiKeysPage #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
e3d579e410 Add "search box" and a "add new" box to the new API Keys page #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
cc0802cc39 Pick up the type from app/types 2018-09-27 11:53:19 +02:00
Johannes Schill
97d718f87a Pick up the type from app/types 2018-09-27 11:53:18 +02:00
Johannes Schill
e8ba35ab2d Move User type out of UserPicker and into app/types 2018-09-27 11:53:18 +02:00
Johannes Schill
353a836128 wip: Reactify the api keys page #13411 2018-09-27 11:53:18 +02:00
bergquist
c5278af6c4 add support for mysql and postgres unique index error codes 2018-09-27 11:33:13 +02:00
Torkel Ödegaard
31b8bf2d47 Merge pull request #13380 from grafana/13275-pending-invites
switch button for org users
2018-09-27 11:26:07 +02:00
bergquist
3fab616239 implement sql queries for transactional alert reminders 2018-09-27 11:14:44 +02:00
Erik Sundell
e2bda4d321 stackdriver: fix typescript errors 2018-09-27 10:55:11 +02:00
Erik Sundell
b724ca5b93 stackdriver: pass interval from panel to backend 2018-09-27 10:42:28 +02:00
Erik Sundell
c099074d2c stackdriver: remove debug logging 2018-09-27 10:41:51 +02:00
Erik Sundell
0507ff69fb stackdriver: resolve merge conflict 2018-09-27 10:32:30 +02:00
Erik Sundell
c14c848819 stackdriver: update docs so that they align with alignment period rules in stackdriver gui 2018-09-27 10:23:37 +02:00
Erik Sundell
481b8653d9 stackdriver: update alignment period rules according to stackdriver 2018-09-27 10:20:01 +02:00
Daniel Lee
6358d3f314 stackdriver: set target to be raw query 2018-09-27 10:14:10 +02:00
Daniel Lee
d405d8f255 stackdriver: publish docs to v5.3 (not root) 2018-09-27 10:14:10 +02:00
bergquist
ff79f80685 initial rename refactoring 2018-09-27 09:43:00 +02:00
bergquist
0476520f2d changelog: adds note about closing #12534 2018-09-27 09:25:57 +02:00
Marcus Efraimsson
f6b8d3a1c2 devenv: grafana high availability (ha) test setup 2018-09-27 09:24:40 +02:00
Carl Bergquist
464f3f738f Merge pull request #13360 from sapcc/symlinks
resolve symlink on each run
2018-09-27 09:21:29 +02:00
Erik Sundell
3c6c456592 stackdriver: use more appropriate test data 2018-09-27 09:19:24 +02:00
Torkel Ödegaard
dbec2ded25 Update CHANGELOG.md 2018-09-27 09:15:23 +02:00
Torkel Ödegaard
a6b32305e9 Merge pull request #12219 from PrincipalsOffice/fix-#12030
Prevent refresh on fixed time window
2018-09-27 09:14:02 +02:00
Torkel Ödegaard
c962fb675e Merge pull request #13432 from mjtrangoni/add-goconst-circleci
Add goconst to CircleCI
2018-09-27 08:41:36 +02:00
Mario Trangoni
803e716213 Add goconst to CircleCI 2018-09-26 22:43:15 +02:00
Torkel Ödegaard
283f693600 fix: also set dashboard refresh to false 2018-09-26 13:13:00 -07:00
Torkel Ödegaard
0f4904038e simplified fix for 12030 2018-09-26 13:08:55 -07:00
Jiang Ye
4c4e5533a1 prevent refresh on fixed time window 2018-09-26 13:08:55 -07:00
Peter Holmberg
32389f6171 using more variables 2018-09-26 21:27:14 +02:00
Torkel Ödegaard
ec4b165b3c Merge pull request #13392 from mjtrangoni/fix-goconst-issues
Fix goconst issues
2018-09-26 20:12:44 +02:00
Torkel Ödegaard
5a2b1b1abf Merge pull request #13424 from aidan-/master
imguploader: Add support for ECS credential provider for S3
2018-09-26 20:05:04 +02:00
Erik Sundell
284d0b7edf Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-26 18:04:30 +02:00
Erik Sundell
75a2ea5c71 stackdriver: fix broken test 2018-09-26 18:04:04 +02:00
Daniel Lee
66c95991c1 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-26 17:59:56 +02:00
Erik Sundell
2628ef7ed2 Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-26 17:58:50 +02:00
Erik Sundell
c3780d09d4 stackdriver: workaround for the fact the jest definitions does not include not 2018-09-26 17:56:45 +02:00
Daniel Lee
4c695dbd57 stackdriver: docs update 2018-09-26 17:54:32 +02:00
Erik Sundell
ed6d3bf6ed stackdriver: WIP - implement stackdriver style auto alignment period. also return the used alignment period and display it in the query editor 2018-09-26 17:50:08 +02:00
Marcus Efraimsson
869e36995a Merge pull request #13427 from svenklemm/postgres-suggest-null-fix
filter NULL values in column value suggestion query
2018-09-26 16:21:11 +02:00
Erik Sundell
af9033f3e0 stackdriver: distinct grafana auto from stackdriver auto in alignment period 2018-09-26 15:44:09 +02:00
Erik Sundell
13c68e6ed8 stackdriver: use correct name for variable 2018-09-26 15:37:29 +02:00
Leonard Gram
5cf0fb49bb Merge pull request #13402 from bergquist/alert_notifier_reminder
alerting: move all notification conditions to defaultShouldNotify
2018-09-26 15:36:39 +02:00
Erik Sundell
cb90b638d7 stackdriver: remove montly from alignment periods 2018-09-26 15:22:07 +02:00
Peter Holmberg
3590ca2632 Added constant 2018-09-26 15:18:46 +02:00
Peter Holmberg
70c3e1f3bc tests 2018-09-26 15:12:06 +02:00
Erik Sundell
dde033c14a stackdriver: add alignemnt period 2018-09-26 15:03:44 +02:00
Erik Sundell
b883d7c1f3 stackdriver: make sure service and metric display name is used instead of value when loading a saved query editor 2018-09-26 15:01:02 +02:00
bergquist
b04052f515 alerting: move all notification conditions to defaultShouldNotify 2018-09-26 14:34:10 +02:00
Erik Sundell
2965f58838 stackdriver: use correct event name 2018-09-26 13:42:53 +02:00
Erik Sundell
85fce84087 stackdriver: fix broken tests 2018-09-26 13:39:03 +02:00
Erik Sundell
1a91e0baf6 stackdriver: update aggregation and alignment before refreshing when changing metric 2018-09-26 13:22:20 +02:00
Erik Sundell
508601c28c stackdriver: use correct naming convention 2018-09-26 11:23:46 +02:00
Erik Sundell
186dcc001c Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-26 11:17:52 +02:00
Erik Sundell
49cd31ab78 stackdriver: get value type and metric kind from metric descriptor instead of from latest metric result 2018-09-26 11:17:24 +02:00
Sven Klemm
9dbdc29118 filter NULL values for column value suggestions 2018-09-26 10:56:25 +02:00
Torkel Ödegaard
8b5aefae26 Merge pull request #13417 from British-Steel/Remove-dropdown-menu-open-class-when-out-of-focus
Remove .dropdown-menu-open on body click fixes #13409
2018-09-26 10:54:38 +02:00
Patrick O'Carroll
e9790c9f1b changed to first and last child 2018-09-26 07:56:33 +02:00
Aidan Rowe
53c7b33926 imguploader: Add support for ECS credential provider for S3 2018-09-26 10:22:17 +10:00
Daniel Lee
0a77cd5569 stackdriver: adds on-change with debounce for alias by field 2018-09-26 00:33:18 +02:00
Carl Bergquist
af0f3f2119 Merge pull request #13391 from grafana/provisioning-interval
provisioning: changed update interval default 3 to 10 seconds
2018-09-25 22:43:34 +02:00
Marcus Efraimsson
90595ffdce cli: fix init of bus 2018-09-25 21:31:24 +02:00
Chris Hicks
499b71c8ff Remove .dropdown-menu-open on body click fixes #13409 2018-09-25 16:12:11 +01:00
Erik Sundell
2d602bfcf3 stackdriver: improve aggregation logic 2018-09-25 17:03:10 +02:00
Erik Sundell
38e32a902e stackdriver: fix failing test 2018-09-25 16:51:39 +02:00
Erik Sundell
3f7314831f stackdriver: wip: split metric dropdown into two parts - resource and metric 2018-09-25 16:51:12 +02:00
Peter Holmberg
64eace96c0 first test 2018-09-25 16:50:13 +02:00
Erik Sundell
a41c5f7b37 stackdriver: remove console.log 2018-09-25 16:40:15 +02:00
Peter Holmberg
0b7576a1f9 filter plugins and layout mode 2018-09-25 16:21:52 +02:00
Carl Bergquist
4520962ac2 Merge pull request #13401 from grafana/render-limits
Concurrent render limits
2018-09-25 15:28:57 +02:00
Erik Sundell
7f43909390 stackdriver: typescriptifying controller 2018-09-25 15:16:33 +02:00
Erik Sundell
b6a918ba79 stackdriver: merge commit 2018-09-25 15:13:24 +02:00
Torkel Ödegaard
c7ea2d10a2 Merge pull request #13413 from grafana/remove-ln-r
Remove option r from ln command since its not working everywhere
2018-09-25 14:58:07 +02:00
Peter Holmberg
e8cc0f3fff render list 2018-09-25 14:53:55 +02:00
Erik Sundell
7666e7bfe3 stackdriver: break out aggretation logic into its own directive and controller. also adds tests for new dropdown population logic 2018-09-25 14:42:47 +02:00
Johannes Schill
54f7920f0d Remove option r from ln command since its not working everywhere 2018-09-25 14:02:55 +02:00
Torkel Ödegaard
862ca07f03 fix: updated tests 2018-09-25 14:01:38 +02:00
Peter Holmberg
ff96a6b766 using variable 2018-09-25 13:39:22 +02:00
Torkel Ödegaard
8009bc3940 Merge pull request #13407 from grafana/13312_legend_table_width
13312 legend table width
2018-09-25 13:17:35 +02:00
Torkel Ödegaard
b131bb20c9 Merge pull request #13410 from connection-reset/your-youre
Fix spelling of your and you're
2018-09-25 13:16:46 +02:00
Axel Pirek
d2f2c3f220 Fix spelling of your and you're 2018-09-25 12:38:02 +02:00
Torkel Ödegaard
cb96c6d942 Changed setting to be an alerting setting 2018-09-25 12:17:04 +02:00
Peter Holmberg
bb20e5cb94 created test for graph disclaimer 2018-09-25 11:50:55 +02:00
Johannes Schill
4640528857 Remove non-existing css prop 2018-09-25 11:17:26 +02:00
Johannes Schill
776f55dc80 fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312 2018-09-25 11:14:44 +02:00
Erik Sundell
b700c6b0e4 stackdriver: populate alignment and aggregation dropdowns based on metric type and value type 2018-09-25 09:34:14 +02:00
Peter Holmberg
ecf08b060c limit number of time series show in explore graph 2018-09-24 16:35:24 +02:00
Torkel Ödegaard
4dab595ed7 rendering: Added concurrent rendering limits 2018-09-24 16:14:11 +02:00
Daniel Lee
1aba5f814b stackdriver: fix test after parameter added to constructor 2018-09-24 16:05:16 +02:00
Daniel Lee
4777689f29 stackdriver: skeleton for more query types on the backend 2018-09-24 16:02:35 +02:00
Daniel Lee
fbc1af6cd5 stackdriver: better error handling for getLabels 2018-09-24 15:40:10 +02:00
Daniel Lee
c9ee05422f stackdriver: move getLabels from query_ctrl to datasource
so can reuse for annotation query ctrl.
2018-09-24 15:26:49 +02:00
Torkel Ödegaard
b41333d4b9 Merge pull request #13398 from bergquist/bulk_alerting_dashboards
devenv: adds script for creating many dashboards with alerts
2018-09-24 14:51:19 +02:00
Patrick O'Carroll
daffa7d067 removed border, cleaned up css and fixed class naming 2018-09-24 12:49:29 +02:00
Marcus Efraimsson
30fe407e8e devenv: fix uid for bulk alert dashboards 2018-09-24 12:45:30 +02:00
David Kaltschmidt
d07a3a7637 Explore: moved code to app/features/explore 2018-09-24 12:16:06 +02:00
Torkel Ödegaard
db1153e5df Merge pull request #12877 from grafana/davkal/explore-logs-labels
Explore: label selector for logging
2018-09-24 11:42:48 +02:00
bergquist
fd5acdd857 target gfdev-prometheus datasource 2018-09-24 10:59:39 +02:00
Daniel Lee
e101bcdb13 stackdriver: fix bug when multiple projects connected to service account
We had incorrectly assumed that a service account could only be connected
to one project.
2018-09-24 10:17:06 +02:00
bergquist
9774ec0ad7 devenv: adds script for creating many dashboards with alerts 2018-09-24 10:00:47 +02:00
Daniel Lee
636d8421d0 stackdriver: refactoring - extract out filtersegments component 2018-09-24 00:59:28 +02:00
Daniel Lee
681cd7496e stackdriver: alias patterns WIP
This is using the {{}} syntax for alias patterns. Might
switch to the  syntax instead.
2018-09-23 22:04:24 +02:00
Mario Trangoni
0870464ea5 Fix goconst issues
See,
$ gometalinter --vendor --disable-all --enable=goconst --disable=gotype --deadline=6m ./...
build.go:113:15⚠️ 2 other occurrence(s) of "linux" found in: build.go:119:15 build.go:491:34 (goconst)
build.go:119:15⚠️ 2 other occurrence(s) of "linux" found in: build.go:113:15 build.go:491:34 (goconst)
build.go:491:34⚠️ 2 other occurrence(s) of "linux" found in: build.go:113:15 build.go:119:15 (goconst)
build.go:381:21⚠️ 2 other occurrence(s) of "windows" found in: build.go:423:13 build.go:487:13 (goconst)
build.go:423:13⚠️ 2 other occurrence(s) of "windows" found in: build.go:381:21 build.go:487:13 (goconst)
build.go:487:13⚠️ 2 other occurrence(s) of "windows" found in: build.go:381:21 build.go:423:13 (goconst)
pkg/api/dashboard.go:67:22⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/dashboard.go:67:35⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/dashboard.go:131:10⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/dashboard.go:406:13⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/folder.go:98:22⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:35 (goconst)
pkg/api/folder.go:98:35⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 (goconst)
pkg/api/index.go:63:47⚠️ 2 other occurrence(s) of "light" found
in: pkg/api/index.go:91:22 pkg/api/index.go:93:16 (goconst)
pkg/api/index.go:91:22⚠️ 2 other occurrence(s) of "light" found in: pkg/api/index.go:63:47 pkg/api/index.go:93:16 (goconst)
pkg/api/index.go:93:16⚠️ 2 other occurrence(s) of "light" found in: pkg/api/index.go:63:47 pkg/api/index.go:91:22 (goconst)
pkg/components/null/float.go:71:25⚠️ 2 other occurrence(s) of "null" found in: pkg/components/null/float.go:103:10 pkg/components/null/float.go:112:10 (goconst)
pkg/components/null/float.go:103:10⚠️ 2 other occurrence(s) of "null" found in: pkg/components/null/float.go:71:25 pkg/components/null/float.go:112:10 (goconst)
pkg/components/null/float.go:112:10⚠️ 2 other occurrence(s) of "null" found in: pkg/components/null/float.go:71:25 pkg/components/null/float.go:103:10 (goconst)
pkg/services/alerting/notifiers/pagerduty.go:79:16⚠️ 2 other occurrence(s) of "Triggered metrics:\n\n" found in: pkg/services/alerting/notifiers/kafka.go:64:16 pkg/services/alerting/notifiers/opsgenie.go:98:16 (goconst)
pkg/services/alerting/notifiers/kafka.go:64:16⚠️ 2 other occurrence(s) of "Triggered metrics:\n\n" found in: pkg/services/alerting/notifiers/pagerduty.go:79:16 pkg/services/alerting/notifiers/opsgenie.go:98:16 (goconst)
pkg/services/alerting/notifiers/opsgenie.go:98:16⚠️ 2 other occurrence(s) of "Triggered metrics:\n\n" found in: pkg/services/alerting/notifiers/pagerduty.go:79:16 pkg/services/alerting/notifiers/kafka.go:64:16 (goconst)
pkg/social/social.go:85:11⚠️ 2 other occurrence(s) of "grafana_com" found in: pkg/social/social.go:162:14 pkg/social/social.go:197:11 (goconst)
pkg/social/social.go:162:14⚠️ 2 other occurrence(s) of "grafana_com" found in: pkg/social/social.go:85:11 pkg/social/social.go:197:11 (goconst)
pkg/social/social.go:197:11⚠️ 2 other occurrence(s) of "grafana_com" found in: pkg/social/social.go:85:11 pkg/social/social.go:162:14 (goconst)
pkg/tsdb/elasticsearch/time_series_query.go:92:17⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/response_parser.go:152:8 pkg/tsdb/elasticsearch/response_parser.go:167:31 pkg/tsdb/elasticsearch/response_parser.go:315:9 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:152:8⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/time_series_query.go:92:17 pkg/tsdb/elasticsearch/response_parser.go:167:31 pkg/tsdb/elasticsearch/response_parser.go:315:9 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:167:31⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/time_series_query.go:92:17 pkg/tsdb/elasticsearch/response_parser.go:152:8 pkg/tsdb/elasticsearch/response_parser.go:315:9 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:315:9⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/time_series_query.go:92:17 pkg/tsdb/elasticsearch/response_parser.go:152:8 pkg/tsdb/elasticsearch/response_parser.go:167:31 (goconst)
pkg/tsdb/elasticsearch/time_series_query.go:78:9⚠️ 2 other occurrence(s) of "date_histogram" found in: pkg/tsdb/elasticsearch/response_parser.go:84:22 pkg/tsdb/elasticsearch/response_parser.go:369:24 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:84:22⚠️ 2 other occurrence(s) of "date_histogram" found in: pkg/tsdb/elasticsearch/time_series_query.go:78:9 pkg/tsdb/elasticsearch/response_parser.go:369:24 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:369:24⚠️ 2 other occurrence(s) of "date_histogram" found in: pkg/tsdb/elasticsearch/time_series_query.go:78:9 pkg/tsdb/elasticsearch/response_parser.go:84:22 (goconst)
2018-09-23 21:19:21 +02:00
Torkel Ödegaard
bdea8d2485 Merge pull request #13394 from jsferrei/include-stack-offset
Fix #13356, where tooltips do not display individual values on stacked graphs
2018-09-23 20:54:03 +02:00
Jon Ferreira
e91729a568 When stacking graphs, always include the y-offset so that tooltips can
render proper values for individual points
2018-09-22 15:02:01 -04:00
Torkel Ödegaard
98dad530e2 provisioning: changed provisioning default update interval from 3 to 10 seconds 2018-09-22 10:06:57 +02:00
Torkel Ödegaard
3fd3dbba8a Merge pull request #13388 from jsferrei/fix-metric-segment-typeahead
Fix metric-segment options displaying after blur
2018-09-22 09:42:53 +02:00
Jon Ferreira
5fd24e2435 Fix https://github.com/grafana/grafana/issues/13387 metric segment
options displays after blur
2018-09-21 17:25:37 -04:00
Marcus Efraimsson
9fe0dcec0e Merge pull request #12716 from Bigtalljosh/patch-1
Update Configuration.md
2018-09-21 17:47:52 +02:00
Marcus Efraimsson
7641c37dfc docs: improve oauth generic azure ad instructions 2018-09-21 16:57:39 +02:00
Marcus Efraimsson
87bee3d983 Merge branch 'master' into patch-1 2018-09-21 16:55:09 +02:00
Torkel Ödegaard
4022374181 Merge pull request #12128 from grafana/11056-folder-m
added span with folder title that is shown for recently and starred
2018-09-21 16:49:43 +02:00
Torkel Ödegaard
6db0880fd8 invalidate access token cache after datasource is updated 2018-09-21 14:24:44 +02:00
Marcus Efraimsson
5c2d1134ee Merge pull request #13383 from mjtrangoni/fix-misspell-issues
Fix misspell issues
2018-09-21 14:02:49 +02:00
Mario Trangoni
60dfff11a0 Fix datbase > database 2018-09-21 13:41:31 +02:00
Mario Trangoni
da46cc2fca Fix changed want md5 hash 2018-09-21 13:41:03 +02:00
Mario Trangoni
f0167e17ed Revert Fahrenheit to Farenheit
This is a typo in
https://github.com/grafana/grafana/blob/master/public/app/core/utils/kbn.ts#L1051
2018-09-21 13:39:24 +02:00
Mario Trangoni
80fa66fcb0 Fix some typos found by codespell
See,
$ codespell -S "./.git*,./vendor*,./public*"
2018-09-21 11:54:52 +02:00
Mario Trangoni
3689bb778c Fix misspell issues
See,
$ gometalinter --disable-all --enable misspell --deadline 10m --vendor ./...
pkg/api/dtos/alerting_test.go:32:13⚠️ "expectes" is a misspelling of "expects" (misspell)
pkg/api/static/static.go:2:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/components/imguploader/azureblobuploader.go:55:48⚠️ "conatiner" is a misspelling of "container" (misspell)
pkg/login/ldap_settings.go:51:115⚠️ "compatability" is a misspelling of "compatibility" (misspell)
pkg/middleware/auth_proxy_test.go:122:22⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/middleware/logger.go:2:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/services/notifications/codes.go:9:13⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/services/session/mysql.go:170:3⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/mysql.go:171:24⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:95:4⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:96:1⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:167:25⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/setting/setting.go:1:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/tsdb/cloudwatch/cloudwatch.go:199:14⚠️ "resolutin" is a misspelling of "resolutions" (misspell)
pkg/tsdb/cloudwatch/cloudwatch.go:270:15⚠️ "resolutin" is a misspelling of "resolutions" (misspell)
pkg/tsdb/elasticsearch/response_parser.go:531:24⚠️ "Unkown" is a misspelling of "Unknown" (misspell)
pkg/tsdb/elasticsearch/client/search_request.go:113:7⚠️ "initaite" is a misspelling of "initiate" (misspell)

Note: Unknwon is a library name, and Destory a mysql typo.
2018-09-21 11:54:36 +02:00
Torkel Ödegaard
040095b5a8 fix: use same User-Agent header as in other places in grafana when making external requests 2018-09-21 11:35:55 +02:00
Torkel Ödegaard
855a2a9259 docs: changed Json Web Token wording to be just JSON key file 2018-09-21 11:30:57 +02:00
Torkel Ödegaard
94ee39291f added beta notice 2018-09-21 11:28:19 +02:00
Patrick O'Carroll
c1d36f9e48 created switch button for org users that can toggle between users and invites 2018-09-21 10:25:46 +02:00
Torkel Ödegaard
c282f39121 Merge branch 'master' into stackdriver-plugin 2018-09-21 10:17:13 +02:00
Torkel Ödegaard
68d5738c48 Merge pull request #13341 from grafana/davkal/13336-fix-recording-rules-labels-suggestions
Explore: Fix label suggestions for recording rules
2018-09-21 10:15:57 +02:00
Torkel Ödegaard
663a56cba9 Merge pull request #13374 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-09-21 10:15:21 +02:00
Torkel Ödegaard
785f35b1c9 Merge branch 'master' of github.com:grafana/grafana 2018-09-21 09:24:03 +02:00
Mario Trangoni
03a2a39a2a pkg/tracing/tracing.go: replace deprecated cfg.New function
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tracing/tracing.go:81:25⚠️ cfg.New is deprecated: use NewTracer() function  (SA1019) (megacheck)
2018-09-20 22:32:22 +02:00
Daniel Lee
ddee919edc stackdriver: remove WIP tests 2018-09-20 20:34:16 +02:00
Mario Trangoni
0dea8fe1e0 pkg/services/sqlstore/user.go: empty branch
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/services/sqlstore/user.go:274:3⚠️ empty branch (SA9003) (megacheck)
2018-09-20 20:16:14 +02:00
Mario Trangoni
303e70db25 pkg/tsdb/elasticsearch/response_parser.go: simplify redundant code
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tsdb/elasticsearch/response_parser.go:95:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:125:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:317:5⚠️ redundant break statement (S1023) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:358:5⚠️ redundant break statement (S1023) (megacheck)
2018-09-20 20:07:03 +02:00
Mario Trangoni
b609d81194 pkg/tsdb/elasticsearch/client/search_request.go: simplify loop with
append.

$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tsdb/elasticsearch/client/search_request.go:59:4⚠️ should replace loop with sr.Aggs = append(sr.Aggs, aggArray...) (S1011) (megacheck)
pkg/tsdb/elasticsearch/client/search_request.go:303:4⚠️ should replace loop with agg.Aggregation.Aggs = append(agg.Aggregation.Aggs, childAggs...) (S1011) (megacheck)
2018-09-20 20:00:02 +02:00
Marcus Efraimsson
a6c438c878 Merge pull request #13367 from grafana/davkal/explore-julius-fixes
Explore: Query field fixes
2018-09-20 17:57:01 +02:00
David Kaltschmidt
9e86809ace Explore: remove closing brace with opening brace 2018-09-20 17:22:38 +02:00
David Kaltschmidt
0e173918aa Explore: show series title in tooltip of legend item 2018-09-20 17:02:26 +02:00
David Kaltschmidt
377bc44062 Explore: dont rate-hint on rate queries 2018-09-20 16:59:06 +02:00
David Kaltschmidt
4a8d80a940 Explore: Fix metric suggestions when first letters have been typed 2018-09-20 16:57:58 +02:00
Marcus Efraimsson
d8b566a177 Merge pull request #13363 from k3ypad/auth_overview_typo
Fix misspelled authentication in Auth overview doc
2018-09-20 16:28:34 +02:00
Ben Doyle
7a95791025 Fix misspelled authentication in Auth overview doc 2018-09-20 14:16:43 +01:00
Arno Uhlig
1355c00c44 fix reader linux test 2018-09-20 13:42:56 +02:00
Arno Uhlig
6b2d91815a resolve symlink on each run 2018-09-20 11:46:32 +02:00
Daniel Lee
8211f7d0ea stackdriver: add templating support for metric, filter and group by
Still have to figure out if we should have templating for aggregation
fields
2018-09-20 11:44:17 +02:00
Daniel Lee
8d1f293676 stackdriver: use group by fields to create default alias 2018-09-20 00:52:14 +02:00
Marcus Efraimsson
667ca3d54d devenv: fix docker blocks paths 2018-09-19 17:59:55 +02:00
Torkel Ödegaard
c67327d768 Merge branch 'master' of github.com:grafana/grafana 2018-09-19 17:45:58 +02:00
Marcus Efraimsson
28ff8a6716 Merge pull request #13342 from svenklemm/unnest
Don't use unnest in queries for redshift compatibility
2018-09-19 16:08:23 +02:00
Marcus Efraimsson
978284bc3d devenv: re-add missing docker-compose files 2018-09-19 14:35:27 +02:00
Torkel Ödegaard
6eb15df953 Merge pull request #13339 from grafana/davkal/13337-fix-rules-filter
Explore: Fix click to filter for recording rule expressions
2018-09-19 13:53:42 +02:00
David Kaltschmidt
f25538744d Explore: Fix label suggestions for recording rules
- parsing of recording rules failed for label suggestor
- added ':' to parsing routine
2018-09-19 12:01:02 +02:00
David Kaltschmidt
6aac8610eb Explore: Fix click to filter for recording rule expressions
- recording rule names contain ':'
- include this in the pattern for metric names
2018-09-19 11:45:55 +02:00
Sven Klemm
e07513bd65 Don't use unnest in queries for redshift compatibility 2018-09-19 10:59:25 +02:00
Carl Bergquist
fe9d86c070 Merge pull request #13330 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-09-19 09:52:09 +02:00
Torkel Ödegaard
dc1535cf64 Merge branch 'master' of github.com:grafana/grafana 2018-09-19 09:09:25 +02:00
Mario Trangoni
13a1d0a026 pkg/tsdb/elasticsearch/client/client.go: use time.Since instead of time.Now().Sub
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/tsdb/elasticsearch/client/client.go:147:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:190:14⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:218:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
2018-09-18 23:42:25 +02:00
Mario Trangoni
f19fd1a9b0 pkg/plugins/dashboards_updater.go: Simplify err check
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/plugins/dashboards_updater.go:51:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2018-09-18 23:42:25 +02:00
Mario Trangoni
bb5aaa2dce pkg/services/sqlstore/alert_notification.go: Simplify err check
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/services/sqlstore/alert_notification.go:242:3⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2018-09-18 23:42:20 +02:00
Daniel Lee
408d4bda95 stackdriver: add custom User-Agent header 2018-09-18 16:07:14 +02:00
Daniel Lee
e05b86375b stackdriver: remove hardcoding of test project name 2018-09-18 16:02:38 +02:00
Torkel Ödegaard
61b2100b9f Merge pull request #13317 from bergquist/nuke_codecov
disable codecov
2018-09-18 12:33:24 +02:00
Torkel Ödegaard
d964a6505f Merge pull request #13305 from bergquist/devenv_cleanup
removes unused files
2018-09-18 12:32:26 +02:00
bergquist
0f8b9b8ff9 set maxworkers 2 for frontend tests 2018-09-18 12:18:35 +02:00
bergquist
63ed02e626 removes codedov refs 2018-09-18 11:44:31 +02:00
bergquist
1be26ad362 disable codecov 2018-09-18 11:39:22 +02:00
Marcus Efraimsson
ccf3cb5c8b Merge pull request #13307 from Nick-Triller/fix_setting_test
Fix setting test
2018-09-17 18:28:22 +02:00
Nick Triller
f8ca55bb1f Fix setting test 2018-09-17 17:56:52 +02:00
Erik Sundell
7b8ea5fc54 stackdriver: improve query look 2018-09-17 17:34:01 +02:00
bergquist
8dbba467f1 moves /tests to /pkg/plugins
ref #11433
2018-09-17 17:29:47 +02:00
Erik Sundell
cfb8017567 stackdriver: add alignment period to query controller 2018-09-17 17:16:14 +02:00
Erik Sundell
edf38f040d stackdriver: making sure we dont pass too big alignmentPeriods to the stackdriver api 2018-09-17 17:13:06 +02:00
Erik Sundell
f839d12de4 stackdriver: fix broken tests 2018-09-17 16:33:38 +02:00
Erik Sundell
109f00f584 stackdriver: adds default value for alignment period 2018-09-17 16:33:10 +02:00
Erik Sundell
71b1f7f8fd stackdriver: use alignment period that is passed from frontend. if set to auto, use value provided from the panel. also added tests for alignment period 2018-09-17 16:30:06 +02:00
Torkel Ödegaard
e74ce72410 Merge pull request #13301 from bergquist/devenv_tests
moves files from /tests to more appropriate folders
2018-09-17 15:51:42 +02:00
Torkel Ödegaard
3853a0865c Merge pull request #13300 from bergquist/devenv_docker
Moves docker/ to devenv/docker
2018-09-17 15:51:06 +02:00
Erik Sundell
73dc7bddd0 stackdriver: use alignment that is passed from frontend in the query 2018-09-17 14:34:18 +02:00
Erik Sundell
549b4fc0ae stackdriver: adds advanced options collapse to query editor with the possibility to select secondary aggregation and alignment 2018-09-17 14:32:49 +02:00
Torkel Ödegaard
c2686781b9 Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana 2018-09-17 13:21:11 +02:00
Torkel Ödegaard
742d2041a4 Merge pull request #13282 from grafana/davkal/explore-multiline-syntax
Explore: Add multiline syntax highlighting to query field
2018-09-17 13:20:19 +02:00
bergquist
6938fd5fff Merge branch 'brian2222-patch-1'
* brian2222-patch-1:
  removes testdata from getting started
  Update getting_started.md
2018-09-17 11:51:48 +02:00
bergquist
d84a0ec3e7 removes testdata from getting started 2018-09-17 11:50:22 +02:00
Erik Sundell
f243da756b stackdriver: fix init labels bug 2018-09-17 11:28:10 +02:00
bergquist
8e69d7731a moves benchmark script to devenv
ref #11433
2018-09-17 11:17:23 +02:00
bergquist
c1f797ed90 moves docker/ to devenv/docker 2018-09-17 11:10:03 +02:00
Carl Bergquist
f2247c160a Merge pull request #13279 from bergquist/init_some_counter_as_zero
Internal metrics: starts counters at zero
2018-09-17 11:09:19 +02:00
bergquist
d9ca8b43b7 changelog: adds note about closing #9735 2018-09-17 10:50:32 +02:00
Carl Bergquist
f22f1d46c8 Merge pull request #10163 from grafana/9587_annotation_tags_wih_temp_var
annotations: allows template variables to be used in tag filter
2018-09-17 10:34:38 +02:00
Marcus Efraimsson
6ffca7f184 docs: add version disclaimer for postgres query editor 2018-09-17 10:32:28 +02:00
Marcus Efraimsson
112f03a6ab Merge pull request #13293 from svenklemm/postgres-docs-query-builder
Add documentation for postgres query builder
2018-09-17 10:28:39 +02:00
Carl Bergquist
6dff5e6bc7 Merge pull request #13295 from mjtrangoni/fix-some-megacheck-issues
Fix some megacheck issues
2018-09-17 10:13:34 +02:00
bergquist
8e5000fb31 moves files from /tests to more appropriate folders
ref #11433
2018-09-17 10:10:20 +02:00
bergquist
7588283287 docs: template variable support for annotations 2018-09-17 09:30:03 +02:00
Marcus Efraimsson
b2833daf32 Merge pull request #13285 from marefr/team_member_ext
Team member labels
2018-09-17 09:14:06 +02:00
brian2222
02dd27333e Update getting_started.md
list of datasources updated in section: dashboards, panels, the buildingblocks of grafana...
2018-09-16 18:22:09 -07:00
Mario Trangoni
e85d0e8d6b pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck)
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID
alert.go:193:15⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
alert.go:252:18⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:136:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:169:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:119:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:221:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
team.go:77:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:243:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:267:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:282:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:313:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:475:3⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:479:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:493:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
2018-09-16 12:37:08 +02:00
Mario Trangoni
f73236f8f4 pkg/services/sqlstore: Fix x.Sql is deprecated: use SQL instead. (megacheck)
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep SQL
alert.go:43:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
alert_notification.go:122:12⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
annotation.go:226:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:228:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:302:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:416:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:635:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
migrations/user_mig.go:137:9⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
plugin_setting.go:29:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:41:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:84:13⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:143:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:186:13⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:234:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:172:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:199:17⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:223:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
temp_user.go:99:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
temp_user.go:124:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:375:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:377:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:379:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
2018-09-16 12:26:05 +02:00
Torkel Ödegaard
dd0b1d8410 Merge branch 'remove-mobx' 2018-09-15 15:04:03 +02:00
Torkel Ödegaard
693f2fd8e9 Merge pull request #13273 from grafana/permissions-to-redux
Permissions to redux
2018-09-15 15:02:13 +02:00
Torkel Ödegaard
66ae7ddc02 fix: increased team picker limit to 50, closes #13294 2018-09-15 04:59:45 -07:00
Torkel Ödegaard
438119b806 Merge pull request #13284 from cbonte/hipchat-notifications
fix hipchat color code used for "no data" notifications
2018-09-15 13:57:09 +02:00
Torkel Ödegaard
3f309ff5dd rename folder 2018-09-15 04:50:22 -07:00
Sven Klemm
138e7ab264 Add documentation for PostgreSQL query builder 2018-09-14 21:58:02 +02:00
Daniel Lee
0b41303e10 stackdriver: improve query editor to handle no data better 2018-09-14 19:28:48 +02:00
Daniel Lee
12da19695f stackdriver: fixes in query editor 2018-09-14 17:47:39 +02:00
Daniel Lee
669a1029ed stackdriver: type rename 2018-09-14 17:46:42 +02:00
Marcus Efraimsson
da68b858d7 display team member labels 2018-09-14 17:28:34 +02:00
Marcus Efraimsson
9a6446c2b5 new column for team_member table 2018-09-14 17:27:36 +02:00
Cyril Bonté
0f4ee4ce87 fix hipchat color code used "no data" notifications 2018-09-14 17:22:07 +02:00
Erik Sundell
3ba0195330 stackdriver: merge commit 2018-09-14 17:21:35 +02:00
Erik Sundell
b30d3fb5a1 stackdriver: makes sure filter dropdown doesnt crash if clicked before values are loaded 2018-09-14 17:19:15 +02:00
Daniel Lee
6f5fbf7a43 fixes strange gofmt formatting
VS code refuses to format this correctly unless the zabbix ds
is last in the list.
2018-09-14 17:11:58 +02:00
Torkel Ödegaard
6cdfff52f7 Merge branch 'master' of github.com:grafana/grafana 2018-09-14 17:10:20 +02:00
Torkel Ödegaard
f2833bfd52 Merge pull request #13252 from grafana/10040_active_directory
docs: include active directory ldap example and restructure
2018-09-14 17:09:44 +02:00
Erik Sundell
fa6e31c6d5 stackdriver: adds null check to query 2018-09-14 17:01:27 +02:00
Torkel Ödegaard
462b5d937c gdev: added test dashboard for polystat panel 2018-09-14 16:48:31 +02:00
David Kaltschmidt
face5b1890 Explore: Add multiline syntax highlighting to query field
- the non-nested query field schema did not allow for multi-line
  highlighting
- added explicit code schema and a `makeValue` function that enforces
  the nested structure
- replaced vendored prism-slate adapter with official slate-prism
  package
- renamed language to syntax
2018-09-14 16:38:45 +02:00
Daniel Lee
8b72853d36 stackdriver: add support for filtering to backend 2018-09-14 16:20:51 +02:00
David Kaltschmidt
1a38c45dde Hotfix for Explore (empty page after running query)
Since #13212 adhoc filters are being gathered, in Explore the template
  service has no variables set and then throws when iterating over them.
2018-09-14 16:09:43 +02:00
Daniel Lee
dc6d025d9a stackdriver: add filters to query editor
WIP -> Backend not implemented yet.
2018-09-14 15:44:12 +02:00
Torkel Ödegaard
5fbe8eff4f ldap: made minor change to group search, and to docs 2018-09-14 11:28:17 +02:00
Erik Sundell
9b4a25ed21 stackdriver: fixes remove option in filter 2018-09-14 11:24:02 +02:00
Daniel Lee
982e095f85 dsproxy: add mutex protection to the token caches 2018-09-14 11:13:09 +02:00
bergquist
0bf5a6ad71 metrics: starts some counters at zero
without starting the counter as zero Grafana will not send any metrics
to graphite using the bridge.
2018-09-14 10:06:10 +02:00
Torkel Ödegaard
270b736302 Merge pull request #13270 from tianon/fix-gauge-accuracy
Fix gauge display accuracy for "percent (0.0-1.0)"
2018-09-14 09:58:14 +02:00
Torkel Ödegaard
84a4b64176 Update CHANGELOG.md 2018-09-14 09:57:58 +02:00
Torkel Ödegaard
e58c2ebc1c tech: remove all mobx stuff 2018-09-14 09:43:34 +02:00
Daniel Lee
b5800ffea9 stackdriver: wip - filters for query editor 2018-09-14 09:39:17 +02:00
Daniel Lee
e2e95589e3 stackdriver: adds remove group by option
Adds a -- remove group by -- option to the group by
segment. When chosen it removes the group by.
2018-09-14 09:39:17 +02:00
Daniel Lee
d0a565d853 stackdriver: improve segments for group bys in query editor 2018-09-14 09:39:17 +02:00
Erik Sundell
add23d9716 stackdriver: load time series meta data for group by dropdown 2018-09-14 09:39:17 +02:00
Erik Sundell
5763d3cae2 stackdriver: make sure distinct labels are returned. also added test 2018-09-14 09:39:17 +02:00
Erik Sundell
37fe488b69 stackdriver: fix failing test 2018-09-14 09:39:17 +02:00
Erik Sundell
3f4942418e stackdriver: test get metric types 2018-09-14 09:39:17 +02:00
Daniel Lee
9c8593e71f stackdriver: wip - group bys 2018-09-14 09:39:16 +02:00
Daniel Lee
c71970baa9 stackdriver: update logo 2018-09-14 09:39:16 +02:00
Daniel Lee
b8231b2903 stackdriver: ux for config page, docs updated 2018-09-14 09:39:16 +02:00
Daniel Lee
65cbcc06eb upload: make the button text configurable 2018-09-14 09:39:16 +02:00
Daniel Lee
11c45002f8 stackdriver: add simple readme 2018-09-14 09:38:16 +02:00
Daniel Lee
df6b430405 stackdriver: reverse points array to be in ascending order 2018-09-14 09:38:16 +02:00
Daniel Lee
f4fe26c659 stackdriver: adds support for primary aggregations
WIP: Hardcoded values for the aligner and alignment period. Need
to set the aligment period to the closest min interval and
research the aligner more.
2018-09-14 09:38:16 +02:00
Daniel Lee
0b5783563e stackdriver: better error handling and show query metadata
If the Stackdriver returns an error, show that error in the query
editor. Also, allow the user to see the raw querystring that was sent
to google (for troubleshooting).
2018-09-14 09:38:16 +02:00
Daniel Lee
2683699ab4 stackdriver: tests for parsing api response 2018-09-14 09:38:16 +02:00
Daniel Lee
54f16d5558 stackdriver: add first test for parsing frontend queries 2018-09-14 09:38:16 +02:00
Erik Sundell
95a6838f06 Stackdriver: Fix weird assignment 2018-09-14 09:38:16 +02:00
Erik Sundell
2d52e5d26c Stackdriver: Use metric type from query controller state 2018-09-14 09:38:16 +02:00
Erik Sundell
191b6cc32c Stackdriver: Set target correctly 2018-09-14 09:38:16 +02:00
Erik Sundell
1288860058 Stackdriver: Break out parse response to its own func 2018-09-14 09:38:16 +02:00
Erik Sundell
56e8e50497 Stackdriver: Use ds_auth_provider in stackdriver. This will make sure the token is renewed when it has exporired 2018-09-14 09:38:16 +02:00
Erik Sundell
db170845b0 Stackdriver: Restructured ds proxy tests 2018-09-14 09:38:16 +02:00
Daniel Lee
05f6710454 stackdriver: fix test 2018-09-14 09:38:16 +02:00
Erik Sundell
1725940ab9 Stackdriver: Add new file 2018-09-14 09:38:16 +02:00
Erik Sundell
6a610558c4 Stackdriver: Start breaking out apply route to its own file 2018-09-14 09:38:16 +02:00
Erik Sundell
7f99a14c58 Stackdriver: Parsed url params 2018-09-14 09:38:16 +02:00
Erik Sundell
c8ec3a345c Stackdriver: Parse datapoints correctly 2018-09-14 09:38:16 +02:00
Erik Sundell
97727d167b Stackdriver: Add backed query using 2018-09-14 09:38:16 +02:00
Erik Sundell
73a42df046 Stackdriver: Prettify json 2018-09-14 09:38:16 +02:00
Erik Sundell
f09f5b28d7 Stackdriver: Move data to target 2018-09-14 09:38:16 +02:00
Erik Sundell
1fe70f8290 Stackdriver: Load example metric and start parsing response 2018-09-14 09:38:16 +02:00
Erik Sundell
31417b795c Stackdriver: Exposing stackdriver backend api 2018-09-14 09:38:16 +02:00
Torkel Ödegaard
ddf86c25d7 Merge pull request #13274 from grafana/12946-table-cell-link
Added underline to links in table
2018-09-14 09:38:11 +02:00
Carl Bergquist
047fb770c8 Merge pull request #13269 from DanCech/pluginUpgrade
use pluginName consistently when upgrading plugins
2018-09-14 09:35:58 +02:00
Erik Sundell
23339e4322 Stackdriver: Use new access token API 2018-09-14 09:35:28 +02:00
Erik Sundell
71af62e741 Stackdriver: Temporary exporting token lookup 2018-09-14 09:35:28 +02:00
Erik Sundell
75c002645c Stackdriver: Loads project name and metrics descriptions into the query controller 2018-09-14 09:35:27 +02:00
Erik Sundell
684aa3ff33 Stackdriver: Corrected field title and removed debug logging 2018-09-14 09:35:27 +02:00
Erik Sundell
92d631986f Stackdriver: Removed debug logging 2018-09-14 09:35:27 +02:00
Erik Sundell
533891c03e Stackdriver: Improved feedback for when a JWT is already uploaded in the ds config page 2018-09-14 09:35:27 +02:00
Daniel Lee
b1db6a7d1e docs: first draft for stackdriver datasource 2018-09-14 09:35:27 +02:00
Daniel Lee
e7648c4070 dsproxy: implements support for plugin routes with jwt file
Google Cloud service accounts use a JWT token to get an
oauth access token. This adds support for that.
2018-09-14 09:35:27 +02:00
Erik Sundell
ba7a69dfc4 Stackdriver: Added test for getProjects 2018-09-14 09:35:27 +02:00
Erik Sundell
5bee38ed69 Stackdriver: Refactored api call to google resource manager 2018-09-14 09:35:27 +02:00
Erik Sundell
a4ef4792bc Stackdriver: Add scope for google resource manager 2018-09-14 09:35:26 +02:00
Erik Sundell
f6c18cf788 Stackdriver: Fixed error message from google resource manager 2018-09-14 09:35:26 +02:00
Erik Sundell
55824dc4d8 Removes comment 2018-09-14 09:35:26 +02:00
Erik Sundell
aff1de9892 Adds skeleton for loading projects from google resource manager 2018-09-14 09:35:26 +02:00
Erik Sundell
6840968780 Adds unit tests to test datasource 2018-09-14 09:35:26 +02:00
Erik Sundell
f9b7524423 Implemented datasource test 2018-09-14 09:35:26 +02:00
Erik Sundell
350bcf4f56 Fixed broken if statement 2018-09-14 09:35:26 +02:00
Erik Sundell
7197a4c17f Adds jwt token signing google auth 2018-09-14 09:35:26 +02:00
Erik Sundell
b71e7f33c3 Improved user experience 2018-09-14 09:35:26 +02:00
Erik Sundell
4fa4c27537 Upload: Fixing link function in directive 2018-09-14 09:35:26 +02:00
Erik Sundell
ef3beb1f0e Adds poc code for retrieving google auth accesstoken 2018-09-14 09:33:50 +02:00
Erik Sundell
834d06c35b Build new stackdriver frontend script 2018-09-14 09:33:50 +02:00
Erik Sundell
9ee61b6606 Add stackdriver backend skeleton 2018-09-14 09:33:50 +02:00
Erik Sundell
f0f19e0c03 Adds stackdriver frontend skeleton 2018-09-14 09:33:50 +02:00
Torkel Ödegaard
0e9a6dcedc Use datasource cache for backend tsdb/query endpoint (#13266)
fix: use datasource cache for backend datasources
2018-09-14 09:30:32 +02:00
Patrick O'Carroll
7b0215380f added underline to links in table 2018-09-14 08:31:41 +02:00
Torkel Ödegaard
331be7d47a fix: add permission fixes 2018-09-14 08:25:35 +02:00
Torkel Ödegaard
776d81189f test: added simple dashboard reducer test 2018-09-14 07:52:17 +02:00
Torkel Ödegaard
7bb0109261 feat: dashboard permissions are working 2018-09-14 07:47:33 +02:00
Tianon Gravi
74912dca8d Fix gauge display accuracy for "percent (0.0-1.0)"
The "Decimals" value was incorrectly applied to the metric value used to calculate the gauge display in addition to the text value (so a "Decimals" value of "1" turns "45.1%" into "50%" in the gauge display even though the label still correctly says "45.1%").
2018-09-13 15:41:49 -07:00
Dan Cech
124b21a6aa use pluginName consistently when upgrading plugins 2018-09-13 17:19:51 -04:00
Torkel Ödegaard
06855d2bc3 Merge pull request #13253 from grafana/13240_auth_stats
Fix anonymous usage stats for authentication types
2018-09-13 21:17:16 +02:00
Torkel Ödegaard
4b0eeab2b3 Merge pull request #13259 from bergquist/disable_metrics_endpoint
[metrics]enabled = false should disable the /metrics endpoint.
2018-09-13 21:14:28 +02:00
Carl Bergquist
ec5aa332ac removes old unused examples (#13260)
Just wanted to reduce the amount of files/folders in root
2018-09-13 21:09:21 +02:00
Torkel Ödegaard
fbfcc62269 fix: added loading screen error scenario (#13256) 2018-09-13 21:08:41 +02:00
David Kaltschmidt
379227c75d Updated CHANGELOG.md 2018-09-13 17:52:28 +02:00
Marcus Efraimsson
e33b2d5fce changelog: add notes about closing #11555
[skip ci]
2018-09-13 17:29:37 +02:00
David
d67d890ccc Merge pull request #11789 from mtanda/prom_annotation_series_timestamp
(prometheus) add annotation option to treat series value as timestamp
2018-09-13 17:21:12 +02:00
Sven Klemm
0254a29e35 Interpolate $__interval in backend for alerting with sql datasources (#13156)
add support for interpolate $__interval and  $__interval_ms in sql datasources
2018-09-13 16:51:00 +02:00
Marcus Efraimsson
1d66f9a42c anonymous usage stats for authentication types 2018-09-13 16:36:23 +02:00
bergquist
bff350166e disabling internal metrics disables /metric endpoint
but we will still keep sending metrics to graphite

closes #10638
2018-09-13 16:09:52 +02:00
Torkel Ödegaard
c7fdea1dfb wip: dashboard permissions to redux 2018-09-13 16:00:02 +02:00
bergquist
aed8208d78 renames PartialMatch to MatchAny 2018-09-13 15:15:42 +02:00
Torkel Ödegaard
d173ebe7e8 Merge branch 'master' into permissions-to-redux 2018-09-13 14:48:04 +02:00
Torkel Ödegaard
e1a1da9064 fix: add folder permission fix 2018-09-13 14:31:12 +02:00
Torkel Ödegaard
bae560717d fix: fixed tslint issue introduced in recent prometheus PR merge 2018-09-13 14:23:43 +02:00
Torkel Ödegaard
f2edb82e79 Folder pages to redux (#13235)
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
2018-09-13 14:10:51 +02:00
Torkel Ödegaard
d35eca333f folder permissions in redux 2018-09-13 13:56:09 +02:00
Mitsuhiro Tanda
dc08093f6c minor fix 2018-09-13 20:15:33 +09:00
Mitsuhiro Tanda
3031c2e6fc fix test 2018-09-13 20:07:43 +09:00
Mitsuhiro Tanda
2926725bab add annotation option to treat series value as timestamp 2018-09-13 20:05:30 +09:00
David
e4496080ff Merge pull request #12251 from mtanda/prometheus_use_matchers_for_completion
(prometheus) get label name/value from series API
2018-09-13 11:48:13 +02:00
Torkel Ödegaard
f360b6186b wip: first couple of things starting to work 2018-09-13 10:52:29 +02:00
Torkel Ödegaard
8096cd8f33 fix: added reducer test 2018-09-13 07:30:27 +02:00
David
a5bcd4b8e4 Adhoc-filtering for prometheus dashboards (#13212)
* Basic adhoc-filtering support for prometheus
2018-09-12 18:10:57 +02:00
Marcus Efraimsson
c56ca57df5 docs: include active directory ldap example and restructure 2018-09-12 17:54:47 +02:00
Dan Doyle
f0e905f3c9 First pass at a text based template var, getting feedback from devs 2018-09-12 13:17:15 +00:00
Torkel Ödegaard
c7bb44b34a fix: url update loop fix (#13243) 2018-09-12 13:13:47 +02:00
Torkel Ödegaard
a317158b72 wip: working on reducer test 2018-09-12 12:18:24 +02:00
Torkel Ödegaard
78d36f784f fix: gofmt issues 2018-09-12 09:55:22 +02:00
Torkel Ödegaard
0705bf570d fix: added loading nav states 2018-09-12 09:47:23 +02:00
bergquist
835a75335c Merge branch 'master' into 9587_annotation_tags_wih_temp_var
* master:
  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)
2018-09-12 09:23:54 +02:00
Torkel Ödegaard
a83beac565 redux: moved folders to it's own features folder 2018-09-12 09:15:18 +02:00
Torkel Ödegaard
7c27a87dcb Merge branch 'master' into folder-to-redux 2018-09-12 08:28:37 +02:00
qhyou11
1786198558 fix theme parameter not working problem while prefer theme set to light (#13232) 2018-09-12 06:52:38 +02:00
Torkel Ödegaard
f5ee91f85a fix: added type export to fix failing test 2018-09-11 19:30:38 +02:00
Torkel Ödegaard
98daceade0 fix: fixed typescript test error 2018-09-11 19:08:32 +02:00
Torkel Ödegaard
ec41d76080 mobx -> redux: major progress on folder migration 2018-09-11 19:00:37 +02:00
Torkel Ödegaard
dd01abc544 another circleci fix 2018-09-11 18:37:02 +02:00
Torkel Ödegaard
48d1ebacbb Another circleci fix 2018-09-11 18:32:19 +02:00
Torkel Ödegaard
207ce0cde1 changed gometalinter to use github master 2018-09-11 18:29:50 +02:00
Torkel Ödegaard
888ac27e25 commented out metalinter as gopkg is having issues 2018-09-11 18:24:07 +02:00
Torkel Ödegaard
19cbff658b wip: folder settings page to redux progress 2018-09-11 17:36:23 +02:00
David
d8a702cba3 Fix prometheus label filtering for comparison queries (#13213)
- Now supports click filtering for queries like `metric > 0.1`
2018-09-11 16:57:43 +02:00
Peter Holmberg
0768a078ed Upgrade react and enzyme (#13224)
* upgrade to latest react and fixed failing test

* upgrading libs

* grunt exec update due to change filename

* new yarn lock

* updated snaps
2018-09-11 16:31:34 +02:00
bergquist
1638c6bea1 enable partial tag matches for annotations 2018-09-11 15:50:04 +02:00
Torkel Ödegaard
89ea47e7fb Merge branch 'master' into folder-to-redux 2018-09-11 15:07:03 +02:00
Patrick O'Carroll
953bdc4dc0 put folder name under dashboard name, tweaked aliginments in search results 2018-09-11 14:53:38 +02:00
bergquist
19c7dd9834 support template variables with multiple values 2018-09-11 14:25:25 +02:00
Peter Holmberg
9f73f13091 Teams page replace mobx (#13219)
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* team settings

* actions for group sync

* tests for team groups

* removed comment

* remove old stores

* fix: formating of datasource.go

* fix: minor changes to imports

* adding debounce and fixing issue in teamlist

* refactoring: moving types to their own files
2018-09-11 14:14:03 +02:00
bergquist
6ba5550f5f renames jest files to match new convention 2018-09-11 14:09:08 +02:00
Torkel Ödegaard
1ce9001141 upgrade of typescript and tslint and jest (#13223) 2018-09-11 13:48:13 +02:00
Mitsuhiro Tanda
28250271cc fix nil pointer dereference (#13221) 2018-09-11 12:53:39 +02:00
bergquist
abd5a74e4c Merge branch 'master' into 9587_annotation_tags_wih_temp_var
* master: (3328 commits)
  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
  moved folders from features into the main feature folder they belong to
  Add jsonnet with grafonnet-lib to provisioning docs
  fix: Dashboard permissions now shows correctly, fixes #13201
  Update CHANGELOG.md
  redux: do not use redux logger middleware in production builds
  Allow oauth email attribute name to be configurable (#13006)
  Document required order for time series queries (#13204)
  refactor: changed AlertRuleItem pause action to callback
  Fix query builder queries for interval start
  renaming things in admin
  release 5.2.4
  changelog: release 5.2.4
  refactoring: custom scrollbars PR updated, #13175
  changelog: add notes about closing #13121
  ...
2018-09-11 11:04:29 +02:00
bergquist
2936e34d75 removes protoc from makefile 2018-09-11 10:53:21 +02:00
Torkel Ödegaard
61112d93d8 wip: folder to redux 2018-09-11 10:36:55 +02:00
Patrick O'Carroll
1599806b75 Merge remote-tracking branch 'origin' into 11056-folder-m 2018-09-11 09:50:15 +02:00
Carl Bergquist
2f9675b3f8 Merge pull request #13217 from mike-sol/master
Add Centrify documentation for generic_oauth
2018-09-11 09:34:48 +02:00
bergquist
b8a881646a changelog: note about closing #11681 2018-09-11 09:25:08 +02:00
Carl Bergquist
5069e4eadd Merge pull request #11681 from Jonnymcc/sort-dashboard-tags
Sort results from GetDashboardTags
2018-09-11 09:19:30 +02:00
Mike Sollanych
6b0de126ce Merge pull request #1 from mike-sol/add-centrify-docs
Adding Centrify configuration for Oauth
2018-09-10 13:31:00 -07:00
Mike Sollanych
55e42b5fff Adding Centrify configuration for Oauth
Just some simple directions for configuring Centrify to enable oauth login!
2018-09-10 13:30:29 -07:00
Torkel Ödegaard
679ffbfd83 wip: progress on redux folder store 2018-09-10 21:49:04 +02:00
Torkel Ödegaard
9caa030108 Merge remote-tracking branch 'origin/teams-page-replace-mobx' into folder-to-redux 2018-09-10 21:14:33 +02:00
Torkel Ödegaard
108a20196f Merge branch 'master' into teams-page-replace-mobx 2018-09-10 19:31:19 +02:00
Peter Holmberg
0cfcf2685e actions for group sync 2018-09-10 16:58:17 +02:00
Peter Holmberg
b1fe0c4c7e team settings 2018-09-10 15:53:58 +02:00
Torkel Ödegaard
59b5b146da wip: began folder to redux migration 2018-09-10 14:30:42 +02:00
Peter Holmberg
841bd5817d test for team member selector 2018-09-10 14:27:33 +02:00
Peter Holmberg
d494ebc730 flattened team state, tests for TeamMembers 2018-09-10 14:19:27 +02:00
Marcus Efraimsson
35a24032a7 Merge pull request #13208 from grafana/fix-dashboard-permissions
fix: Dashboard permissions now shows correctly
2018-09-10 14:00:55 +02:00
Torkel Ödegaard
6c90a53654 refactor: moved stuff into new features dir manage-dashboards 2018-09-10 13:59:31 +02:00
Torkel Ödegaard
e4d9620fc0 move: moved styleguide to admin 2018-09-10 13:38:45 +02:00
Torkel Ödegaard
0f98dcdef0 fix: fixed singlestat test broken due to file move 2018-09-10 13:34:33 +02:00
Torkel Ödegaard
17e99bb38a Merge branch 'master' of github.com:grafana/grafana 2018-09-10 13:29:57 +02:00
Torkel Ödegaard
34567bc4f1 moved folders from features into the main feature folder they belong to 2018-09-10 13:29:27 +02:00
Carl Bergquist
7e0637aa9d Merge pull request #12260 from strohi/panelids-for-htmlbookmark
added id tag to Panels for html bookmarking on longer Dashboards
2018-09-10 13:01:35 +02:00
Marcus Efraimsson
3fe3f3741f Merge pull request #13200 from svenklemm/postgres-query-builder-fixes
Fix query builder queries for interval start
2018-09-10 13:01:17 +02:00
Marcus Efraimsson
227bf85e5e Merge pull request #13184 from svenklemm/postgres-interval_ms
Fix postgres quoting to handle non-string values
2018-09-10 12:43:10 +02:00
Carl Bergquist
37af10c61f Merge pull request #13209 from metalmatze/docs-jsonnet
Add jsonnet with grafonnet-lib to provisioning docs
2018-09-10 11:59:31 +02:00
Matthias Loibl
d561104b64 Add jsonnet with grafonnet-lib to provisioning docs 2018-09-10 11:45:23 +02:00
Torkel Ödegaard
9cfe2a7f5c fix: Dashboard permissions now shows correctly, fixes #13201 2018-09-10 11:35:59 +02:00
Torkel Ödegaard
628ef2d9a9 Update CHANGELOG.md 2018-09-10 10:43:00 +02:00
Torkel Ödegaard
267b96cb48 Merge branch 'master' of github.com:grafana/grafana 2018-09-10 09:54:30 +02:00
Torkel Ödegaard
298c088d57 Merge branch 'redux-poc2' 2018-09-10 09:54:14 +02:00
Torkel Ödegaard
5c58a7d7f4 redux: do not use redux logger middleware in production builds 2018-09-10 09:53:52 +02:00
Bob Shannon
f257ff0216 Allow oauth email attribute name to be configurable (#13006)
* Allow oauth email attribute name to be configurable

Signed-off-by: Bob Shannon <bshannon@palantir.com>

* Document e-mail determination steps for generic oauth

* Add reference to email_attribute_name

* Re-add e-mail determination docs to new generic-oauth page

* Inherit default e-mail attribute from defaults.ini
2018-09-10 09:45:07 +02:00
Sven Klemm
7c78b64a36 Document required order for time series queries (#13204) 2018-09-10 09:33:06 +02:00
Torkel Ödegaard
035b0ab07a Merge branch 'master' into redux-poc2 2018-09-10 09:32:06 +02:00
Torkel Ödegaard
6bdaf57ae7 refactor: changed AlertRuleItem pause action to callback 2018-09-10 09:29:53 +02:00
Sven Klemm
116fb50530 Fix query builder queries for interval start
This changes the rate and increase queries to not calculate
a value when there is no previous value. This also adds an
order by metric column to prevent inconsistent series ordering
in the legend.
2018-09-08 08:28:15 +02:00
Peter Holmberg
59b3bfd342 team members, bug in fetching team 2018-09-07 18:01:59 +02:00
Torkel Ödegaard
a440d3510a renaming things in admin 2018-09-07 17:55:38 +02:00
Marcus Efraimsson
7a117a6b6c release 5.2.4 2018-09-07 16:57:00 +02:00
Marcus Efraimsson
c179926a27 changelog: release 5.2.4 2018-09-07 16:56:31 +02:00
Torkel Ödegaard
4391209f7b Merge branch 'master' into redux-poc2 2018-09-07 14:49:05 +02:00
Peter Holmberg
05bfc36516 Teampages page 2018-09-07 14:32:09 +02:00
Torkel Ödegaard
35ef51dca9 refactoring: custom scrollbars PR updated, #13175 2018-09-07 14:24:33 +02:00
Torkel Ödegaard
1415bed045 Merge branch 'react-custom-scrollbars-wrapper' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-react-custom-scrollbars-wrapper 2018-09-07 12:50:34 +02:00
Marcus Efraimsson
8f054e7c08 changelog: add notes about closing #13121
[skip ci]
2018-09-07 11:30:18 +02:00
Marcus Efraimsson
fc597260c0 Merge pull request #13167 from holiiveira/teams-image
Alert Teams - Adding Action to view the graph by its public URL.
2018-09-07 11:24:06 +02:00
Marcus Efraimsson
a1d1c4fb9a fix code formatting 2018-09-07 11:06:19 +02:00
Sven Klemm
6b863e3b0f Fix quoting to handle non-string values 2018-09-07 10:21:10 +02:00
Alexander Zobnin
8fca79e87e scrollbar refactor: replace HOC by component with children 2018-09-06 22:53:40 +03:00
Carl Bergquist
b070784b8a adds usage stats for alert notifiers (#13173) 2018-09-06 21:03:09 +02:00
Marcus Efraimsson
44cd738dd9 changelog: typo
[skip ci]
2018-09-06 17:03:43 +02:00
Marcus Efraimsson
479e073451 docs: what's new in v5.3 placeholder 2018-09-06 15:22:03 +02:00
Marcus Efraimsson
e05033a693 v5.3.0-beta1 release 2018-09-06 14:38:22 +02:00
Alexander Zobnin
a186bc01e0 tests for withScrollBar() wrapper 2018-09-06 15:37:31 +03:00
Marcus Efraimsson
bdc3acbd2c changelog: restructure and add 5.3.0-beta1 header
[skip ci]
2018-09-06 14:21:36 +02:00
Marcus Efraimsson
3f4099c4a6 changelog: add notes about closing #13157
[skip ci]
2018-09-06 14:09:27 +02:00
Alexander Zobnin
cf832e7db4 wrapper for react-custom-scrollbars component 2018-09-06 15:09:18 +03:00
Marcus Efraimsson
26756f86aa Merge pull request #13148 from svenklemm/postgres-min-interval
Add min time interval support for SQL datasources
2018-09-06 14:05:39 +02:00
Marcus Efraimsson
db639684bb docs: sql datasources min time interval 2018-09-06 13:52:16 +02:00
bergquist
4ce41c16fc changelog: note about closing #10424 2018-09-06 13:33:38 +02:00
Carl Bergquist
3c0b1ef581 Merge pull request #13170 from bergquist/alerting_default_setting
make default values for alerting configurable
2018-09-06 13:26:42 +02:00
Torkel Ödegaard
e364119774 docs: minor fixes 2018-09-06 13:21:11 +02:00
Torkel Ödegaard
320947359c Merge branch '12886-docs-authentication-section' 2018-09-06 13:16:17 +02:00
Torkel Ödegaard
d6f9ebab63 docs: Updated auth docs 2018-09-06 13:15:36 +02:00
Torkel Ödegaard
a25b594506 docs: updated 2018-09-06 12:13:23 +02:00
bergquist
1e33a3780f spelling errors 2018-09-06 11:51:24 +02:00
bergquist
3ce89cad71 make default values for alerting configurable 2018-09-06 11:26:14 +02:00
Henrique Oliveira
e983f8f54b Adding Action to view the graph by its public URL. 2018-09-05 17:35:22 -03:00
Marcus Efraimsson
d76dad86c8 changelog: order changes by group (ocd)
[skip ci]
2018-09-05 18:49:08 +02:00
Marcus Efraimsson
42d26400b1 changelog: add notes about closing #13030
[skip ci]
2018-09-05 18:47:26 +02:00
Marcus Efraimsson
81c5112259 Merge pull request #13165 from grafana/docs-docker-paths
docs: default paths in the docker container.
2018-09-05 18:01:01 +02:00
Patrick O'Carroll
2b74b1c4d6 added radix rule and changed files to follow rule (#13153) 2018-09-05 16:51:31 +02:00
Peter Holmberg
f68ac20218 set search query action and tests 2018-09-05 16:49:36 +02:00
Leonard Gram
500a4b5f35 docs: default paths in the docker container. 2018-09-05 16:46:22 +02:00
Peter Holmberg
7e340b7aa5 delete team 2018-09-05 15:32:51 +02:00
Leonard Gram
5d87aa2fa4 Merge pull request #13031 from bergquist/golang_1.11
upgrade to golang 1.11
2018-09-05 15:31:43 +02:00
Patrick O'Carroll
25f13bd3ad added only-arrow-functions rule and changed files to follow new rule (#13154) 2018-09-05 15:28:30 +02:00
Peter Holmberg
167f009819 load teams and store in redux 2018-09-05 15:13:21 +02:00
Leonard Gram
eed141fb54 build: uses 1.1.0 of the build container. 2018-09-05 15:10:57 +02:00
Peter Holmberg
306c3e6c10 creating types, actions, reducer 2018-09-05 12:34:32 +02:00
Leonard Gram
275f613050 Only authenticate logins when password is set (#13147)
* auth: never authenticate passwords shorter than 4 chars.

* auth: refactoring password length check.

* auth: does not authenticate when password is empty.

* auth: removes unneccesary change.
2018-09-05 12:12:46 +02:00
Torkel Ödegaard
0aea60bf17 Merge branch 'master' into redux-poc2 2018-09-05 12:11:11 +02:00
Torkel Ödegaard
c9ae585d2a Merge branch '12918-no-conditional-assignment' 2018-09-05 12:09:32 +02:00
Torkel Ödegaard
dc236b5063 refatoring: minor changes to PR #13149 2018-09-05 12:09:16 +02:00
Sven Klemm
cb526d4557 Add min time interval to mysql and mssql 2018-09-05 12:02:57 +02:00
Leonard Gram
8ea2f7f858 build: updated build-container with go1.11. 2018-09-05 11:55:28 +02:00
Torkel Ödegaard
00c0b71f3d Merge branch '12918-only-arrow-functions4' 2018-09-05 11:46:54 +02:00
Torkel Ödegaard
99133c4fbb Merge branch '12918-only-arrow-functions' 2018-09-05 11:46:46 +02:00
Torkel Ödegaard
432e203df1 Merge branch '12918-only-arrow-functions3' 2018-09-05 11:26:30 +02:00
Torkel Ödegaard
151e950e2c Merge branch 'master' into 12918-only-arrow-functions 2018-09-05 11:24:52 +02:00
Patrick O'Carroll
777010b20b added no-conditional-assignment rule and changed files to follow new rule 2018-09-05 10:53:58 +02:00
Sven Klemm
e2c7b010ac fix test failures for timeInterval 2018-09-05 10:03:16 +02:00
Sven Klemm
fd269945c9 document postgres min time interval 2018-09-05 09:57:09 +02:00
Sven Klemm
a95453036b Add min time interval to postgres datasource 2018-09-05 09:46:22 +02:00
Patrick O'Carroll
72ab24f300 Changed functions to arrow functions for only-arrow-functions rule. (#13131) 2018-09-05 07:47:30 +02:00
Torkel Ödegaard
d8b3fa01d0 mobx: removed unused SearchStore 2018-09-04 22:38:18 -07:00
Torkel Ödegaard
68767acb1c fix: Updated test 2018-09-04 13:15:45 -07:00
Torkel Ödegaard
1e5ad4da78 redux: minor changes to redux thunk actions and use of typings 2018-09-04 12:59:46 -07:00
Marcus Efraimsson
7c88436a9b Merge pull request #13133 from grafana/13132_query_variable
Fix error when new variables created but not yet added/saved
2018-09-04 17:25:08 +02:00
Peter Holmberg
cab6861d27 Reactify sidebar (#13091)
* created react component and moved markdown

* extracting components

* Broke out parts into components

* tests

* Flattened file structure

* Tests

* made instances typed in test

* typing

* function instead of variable

* updated user model with missing properties

* added full set of properties to user mock

* redone from variable to function

* refactor: minor refactorings of #13091

* removed logging
2018-09-04 17:24:08 +02:00
Patrick O'Carroll
dc4f547a40 Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 17:02:32 +02:00
Peter Holmberg
41dcd7641b removed unused mobx state 2018-09-04 16:13:51 +02:00
Patrick O'Carroll
0f326f18dc changed functions to arrowfunctions for only-arrow-functions rule (#13127) 2018-09-04 15:55:41 +02:00
Torkel Ödegaard
826dfceac0 fix: fixed home dashboard redirect issue when behind reverse proxy, fixes #12429 (#13135) 2018-09-04 15:42:10 +02:00
Peter Holmberg
22510be450 tests 2018-09-04 15:00:04 +02:00
Patrick O'Carroll
19b7ad61dd Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 14:27:03 +02:00
Anthony Woods
5c0fbbf7c8 improve remote image rendering (#13102)
* improve remote image rendering

- determine "domain" during Init() so we are not re-parsing settings
  on every request
- if using http-mode via a rednererUrl, then use the AppUrl for the
  page that the renderer loads.  When in http-mode the renderer is likely
  running on another server so trying to use the localhost or even the
  specific IP:PORT grafana is listening on wont work.
- apply the request timeout via a context rather then directly on the http client.
- use a global http client so we can take advantage of connection re-use
- log and handle errors better.

* ensure imagesDir exists

* allow users to define callback_url for remote rendering

- allow users to define the url that a remote rendering service
  should use for connecting back to the grafana instance.
  By default the "root_url" is used.

* improve remote image rendering

- determine "domain" during Init() so we are not re-parsing settings
  on every request
- if using http-mode via a rednererUrl, then use the AppUrl for the
  page that the renderer loads.  When in http-mode the renderer is likely
  running on another server so trying to use the localhost or even the
  specific IP:PORT grafana is listening on wont work.
- apply the request timeout via a context rather then directly on the http client.
- use a global http client so we can take advantage of connection re-use
- log and handle errors better.

* ensure imagesDir exists

* allow users to define callback_url for remote rendering

- allow users to define the url that a remote rendering service
  should use for connecting back to the grafana instance.
  By default the "root_url" is used.

* rendering: fixed issue with renderKey where userId and orgId was in mixed up, added test for RenderCallbackUrl reading logic
2018-09-04 13:42:55 +02:00
Marcus Efraimsson
1e74d7f20a handle new variables created not yet added 2018-09-04 13:25:44 +02:00
Marcus Efraimsson
ce538007d8 changelog: add notes about closing #10095
[skip ci]
2018-09-04 12:31:11 +02:00
Marcus Efraimsson
7e527de5f1 Merge pull request #11081 from svenklemm/postgres-query-builder
postgres: graphical query builder
2018-09-04 12:24:10 +02:00
Marcus Efraimsson
8fcc9b1891 docs: postgres provisioning 2018-09-04 11:33:43 +02:00
Marcus Efraimsson
f15f4425d3 Merge pull request #12854 from grafana/12853-empty-team-list
[wip]added empty list cta to team list
2018-09-04 11:10:32 +02:00
bergquist
eb7172c3d4 changelog: adds note about closing #13125 2018-09-04 11:09:16 +02:00
Carl Bergquist
2f6af7b811 Merge pull request #13125 from overcookedpanda/master
added Bitcoin as a currency option
2018-09-04 11:07:49 +02:00
Patrick O'Carroll
eca7b76290 fixed title prefix, fixes #13123 (#13128) 2018-09-04 10:33:18 +02:00
Torkel Ödegaard
16fb01ed81 Update CHANGELOG.md 2018-09-04 10:32:57 +02:00
maicon
a6aa219895 Reopen log files after receiving a SIGHUP signal (#13112)
* Reopen log files after receiving a SIGHUP signal

Implements a system signals listener in log.FileLogWriter.

After receiving a SIGHUP signal from the system, the listener will close the current log file and then open it again.

The listener will finishes after receiving a SIGINT, SIGKILL or SIGTERM signal.

Closes grafana/grafana#2497

* Move the SIGHUP handling to the main file
2018-09-04 10:31:41 +02:00
Peter Holmberg
5ac5a08e9e Fixed a bug in the test and added test for filter alert rules 2018-09-04 09:53:24 +02:00
Patrick O'Carroll
0e007d573d changed functions to arrowfunctions for only-arrow-functions rule 2018-09-04 09:53:07 +02:00
Overcooked Panda
4ab3826a08 added Bitcoin as a currency option 2018-09-03 22:02:58 -05:00
Sven Klemm
82e601250d Merge branch 'master' into postgres-query-builder 2018-09-03 22:05:53 +02:00
Patrick O'Carroll
dac2c62545 added new-parens rule (#13119) 2018-09-03 20:36:01 +02:00
Torkel Ödegaard
b0134d30ae Update CHANGELOG.md 2018-09-03 20:35:28 +02:00
Carl Bergquist
ee1083d9b4 cli: avoid rely on response.ContentLength (#13120)
response.ContentLength might be invalid if the http response
is chunked.

fixes #13079
2018-09-03 20:33:21 +02:00
Peter Holmberg
f4594c8320 some basic selector tests 2018-09-03 16:58:11 +02:00
Peter Holmberg
638370e310 pausing alert
need to fix return type on dispatch. Could not test correctly either.
2018-09-03 15:44:39 +02:00
Marcus Efraimsson
db2264c554 docs: v5.2 upgrade notice, ref #13084 2018-09-03 15:12:17 +02:00
Marcus Efraimsson
c1efa13018 changelog: add notes about closing #7330
[skip ci]
2018-09-03 14:56:50 +02:00
Marcus Efraimsson
1ceca5d8ec Merge pull request #12145 from grafana/alerting_reminder
Alerting notification reminder
2018-09-03 14:41:38 +02:00
Peter Holmberg
c958ebd101 extend from purecomponent 2018-09-03 14:05:12 +02:00
Peter Holmberg
1994ca5016 remove log 2018-09-03 14:04:44 +02:00
Peter Holmberg
50444c32e0 actions and reducers for search filter 2018-09-03 13:46:39 +02:00
Sven Klemm
de917dfc4d Merge branch 'master' into postgres-query-builder 2018-09-03 13:43:58 +02:00
Patrick O'Carroll
f8c2b23c86 added rule use-isnan and and updated file to follow new rule (#13117) 2018-09-03 13:31:37 +02:00
Patrick O'Carroll
ebf253d26a added no-namespace and no-reference rules (#13116) 2018-09-03 12:46:25 +02:00
Patrick O'Carroll
b8d82df97e added no-angle-bracket-type-assertion rule and updatet files to follow rule (#13115) 2018-09-03 11:30:44 +02:00
Patrick O'Carroll
7837ee4466 Updated rules for variable name (#13106)
* updated rules for variable name and fixed files that didn't follow new rules

* fixed test so it uses new rule

* made exceptions to rule in interval_variable
2018-09-03 11:00:46 +02:00
Jordan Hamel
0d25aa08fa update wording and punctuation (#13113)
* word fix

support >> supports 
says >> ways

* : for emphasis
2018-09-03 07:58:45 +02:00
Torkel Ödegaard
42aaa2b907 redux: improved state handling 2018-09-02 12:14:41 -07:00
Torkel Ödegaard
3fd707f321 redux: progress 2018-09-02 12:08:31 -07:00
Torkel Ödegaard
2a64d19f5b wip: load alert rules via redux 2018-09-02 11:36:03 -07:00
Torkel Ödegaard
7b06800295 refactor: changed nav store to use nav index and selector instead of initNav action 2018-09-02 10:36:36 -07:00
Torkel Ödegaard
2ac202b22f moving things around 2018-09-02 07:11:21 -07:00
Torkel Ödegaard
de456f8b73 wip: solid progress on redux -> angular location bridge update 2018-08-31 13:16:20 -07:00
Sven Klemm
265d5daf57 Merge branch 'master' into postgres-query-builder 2018-08-31 19:02:46 +02:00
Torkel Ödegaard
6efe9da10f wip: moving things around 2018-08-31 09:49:32 -07:00
Torkel Ödegaard
2c85e44ab7 wip: moveing things around 2018-08-31 09:49:02 -07:00
Torkel Ödegaard
593cc5380f wip: redux refactor 2018-08-31 09:42:32 -07:00
Patrick O'Carroll
abbb6f933c added jsdoc-format rule and fixed files that didn't follow new rule (#13107) 2018-08-31 16:40:43 +02:00
Patrick O'Carroll
944c1da27b set member-access and no-var-keyword to true, removed public in two files (#13104) 2018-08-31 16:40:23 +02:00
Torkel Ödegaard
eef41cbccd Merge branch 'grafana-loading-page' 2018-08-31 07:38:42 -07:00
Torkel Ödegaard
2996c54b72 fix: for text flickering in animation on chrome on windows 2018-08-31 07:37:21 -07:00
Torkel Ödegaard
d68007fde3 wip: redux 2018-08-31 14:38:23 +02:00
Torkel Ödegaard
cf58eea1db redux: wip progress for using redux 2018-08-31 13:24:36 +02:00
Patrick O'Carroll
c9995d39d7 fixed so preloader is removed when app is loaded 2018-08-31 09:57:27 +02:00
Patrick O'Carroll
4f84a2d018 removed console.log 2018-08-31 08:50:34 +02:00
Patrick O'Carroll
bc30e7b322 separated fade-ins for logo and text, tweaked delays and timing for fade-in animations 2018-08-31 08:41:17 +02:00
Torkel Ödegaard
4f91087d9a docs: minor updates, more work to do 2018-08-31 07:15:07 +02:00
Torkel Ödegaard
ad9f38ae4d Merge branch 'master' into redux-poc2 2018-08-30 13:04:29 -07:00
Torkel Ödegaard
77f9b152fa ux: minor fixes to loading screen 2018-08-30 11:59:32 -07:00
Sven Klemm
650e2faf01 Merge branch 'postgres-query-builder' of git+ssh://github.com/svenklemm/grafana into postgres-query-builder 2018-08-30 15:47:10 +02:00
Sven Klemm
d5cdeebf23 reset metric column when changing table 2018-08-30 15:46:57 +02:00
Sven Klemm
88cd713d3a reset metric column when changing table 2018-08-30 15:45:05 +02:00
Sven Klemm
1cac061448 fix timeFilter resetting when changing table 2018-08-30 15:39:01 +02:00
Marcus Efraimsson
5ceaa21e3b when changing table, refresh panel once after columns have been changed 2018-08-30 15:11:54 +02:00
Patrick O'Carroll
6832b80735 added pro-tip text, removed pro-tip link 2018-08-30 15:02:20 +02:00
Patrick O'Carroll
f916add03b fixed styling for background and text, added intro animation, added fade in to text 2018-08-30 14:44:37 +02:00
Sven Klemm
a06a6b6517 fix timecolumn handling when table changes 2018-08-30 14:25:27 +02:00
Sven Klemm
015909dbff set default for timeGroup in query builder to $__interval 2018-08-30 14:16:42 +02:00
Sven Klemm
483f6cc5e1 when changing table reset columns 2018-08-30 14:11:53 +02:00
Sven Klemm
be978d1a8f fix metric column suggestions 2018-08-30 14:09:47 +02:00
Sven Klemm
e2c3b6c6c5 fix suggestions for metric column 2018-08-30 13:05:16 +02:00
Jasper Lievisse Adriaanse
d668a922e6 Return correct path for OpenBSD in cli's returnOsDefault (#13089) 2018-08-30 11:56:52 +02:00
Torkel Ödegaard
9cf26b934d updated changelog 2018-08-30 11:55:54 +02:00
Torkel Ödegaard
154fbe2413 New TV Mode, dashboard toolbar update (layout change & new cycle view mode button) (#13025)
* wip: design update for navbar with kiosk mode button

* feat: progress on new view mode button

* css: view state refactorings

* feat: kiosk modes & playlist support

* feature: cycle tv mode feature, renamed view modes to TV, and Kiosk

* fix: updated the alert notification message

* fix: removed unused parameter

* fix: correct the css class set for tv mode

* some minor improvements to playlist
2018-08-30 11:52:31 +02:00
Torkel Ödegaard
36bc8b77fb Merge branch 'tsconfig-no-implicit-this' 2018-08-30 11:46:13 +02:00
Patrick O'Carroll
a8547ae36e added this:any to functions and changed functions to arrowfunctions 2018-08-30 10:49:18 +02:00
Torkel Ödegaard
dd8076f2cf feat: loading css async & inline svg 2018-08-30 10:32:45 +02:00
David
b8e6817732 Explore: keep query when changing datasources (#13042)
- clear `edited` state for each query when a new datasource is set
2018-08-30 09:05:45 +02:00
Patrick O'Carroll
552a61b6ae changed var to let in 50 files (#13075) 2018-08-30 09:03:11 +02:00
Patrick O'Carroll
b494a29e02 changed var to let in last files (#13087) 2018-08-30 08:58:43 +02:00
Torkel Ödegaard
80d6ef535d tsconfig: started on setting noImplicitThis to true 2018-08-30 08:53:13 +02:00
Torkel Ödegaard
ceadced6f0 tsconfig: format file 2018-08-30 08:33:29 +02:00
Sven Klemm
aa2098fedf document postgres version and TimescaleDB option 2018-08-30 08:18:22 +02:00
Torkel Ödegaard
c960af098a tslint: added 1 more rule, #12918 2018-08-30 07:47:46 +02:00
Torkel Ödegaard
0bb249096f tslint: added 2 more rules and removed unused component, #12918 2018-08-30 07:40:13 +02:00
Torkel Ödegaard
272c09513f tslint: added a new tslint rule 2018-08-30 07:34:17 +02:00
Patrick O'Carroll
0dc8949352 added rule prefer const to tslint (#13071) 2018-08-30 07:18:28 +02:00
Šimon Podlipský
2e1db2ca93 dep ensure (#13074) 2018-08-30 07:18:09 +02:00
Sven Klemm
aadff18e94 hide Query Builder button for table panels 2018-08-29 18:38:18 +02:00
Sven Klemm
a87b27c7d3 check for correct quoting of multiple singlequotes 2018-08-29 16:50:59 +02:00
Sven Klemm
70daa56a31 Merge branch 'master' into postgres-query-builder 2018-08-29 14:44:23 +02:00
Patrick O'Carroll
a702603e7b changed var to const 2 (#13068)
* changed var to const

* fixed typo created in last commit

* added or empty object to options in prometheus/datasource
2018-08-29 14:27:29 +02:00
Patrick O'Carroll
5e0d0c5816 changed var to const (#13061) 2018-08-29 14:26:50 +02:00
Torkel Ödegaard
9423e3e124 Merge branch 'master' of github.com:grafana/grafana 2018-08-29 13:34:11 +02:00
Marcus Efraimsson
800ba84f67 update latest.json to latest stable version 2018-08-29 13:29:29 +02:00
Torkel Ödegaard
1e2fde238c docs: corrected docs description for setting 2018-08-29 13:26:23 +02:00
Sven Klemm
1ee91a637f remove min time interval from datasource config 2018-08-29 13:02:25 +02:00
Sven Klemm
0b74ff5cf1 remove unneeded queryOptions 2018-08-29 12:51:58 +02:00
Marcus Efraimsson
10f55f5511 changelog: add notes about 4.6.4 and 5.2.3 releases 2018-08-29 12:34:27 +02:00
Sven Klemm
7a5b5906ed fix quoting 2018-08-29 12:24:28 +02:00
Sven Klemm
bfac6303d0 strip quotes when auto adding alias 2018-08-29 12:16:07 +02:00
Sven Klemm
ab4fbff454 handle quoting properly for table suggestion 2018-08-29 12:12:11 +02:00
Sven Klemm
e9ab4feeb0 link to github instead 2018-08-29 09:58:08 +02:00
Sven Klemm
955e5afa45 recheck timecolumn when changing table 2018-08-29 09:51:01 +02:00
Sven Klemm
84ec1ce624 update filter macro on time column change 2018-08-29 09:04:33 +02:00
bergquist
12c9860882 string formating fixes 2018-08-28 22:33:38 +02:00
bergquist
ff7b0d4f63 go fmt fixes 2018-08-28 22:14:15 +02:00
Peter Holmberg
b6584f5ad0 Moved tooltip icon from input to label #12945 (#13059) 2018-08-28 15:23:25 +02:00
Marcus Efraimsson
26bb91296d Merge pull request #13056 from LuboVarga/patch-1
Update provisioning.md
2018-08-28 14:44:10 +02:00
Patrick O'Carroll
b8597b4d57 added empty cta to playlist page + hid playlist table when empty (#12841)
* added empty cta to playlist page + hid playlist table when empty

* implemented the empty-list-cta component

* removed extra protip, changed messaging
2018-08-28 14:23:03 +02:00
Patrick O'Carroll
8bdabad86e changed from rotating to bouncing, maybe to much squash and stretch 2018-08-28 13:51:12 +02:00
LuboVarga
13f4d09ed8 Update provisioning.md
wrong data type was mentioned in table for esVersion field. I expect to regenerate doc here: http://docs.grafana.org/administration/provisioning/#datasources
This problem was noted by @stefanes a while ago here: https://github.com/grafana/grafana/issues/11126#issuecomment-370799209
2018-08-28 13:37:55 +02:00
Sven Klemm
30fce34d9c make default mode for table panels raw editor 2018-08-28 12:10:55 +02:00
Marcus Efraimsson
f55aad0ec9 Merge pull request #12919 from grafana/11580-how-to-start-grafana-docs
docs: How to get started with Grafana for the first time
2018-08-28 11:01:00 +02:00
Sven Klemm
62d82920e6 improve description for timescaledb option 2018-08-27 23:20:17 +02:00
Mitsuhiro Tanda
bf8840255c Review feedback. 2018-08-28 01:12:50 +09:00
Mitsuhiro Tanda
e62c083cf0 use series matchers to get label name/value 2018-08-28 01:12:50 +09:00
Marcus Efraimsson
c7279a4e07 changelog: add notes about closing #12865
[skip ci]
2018-08-27 15:19:22 +02:00
Marcus Efraimsson
e204124791 Merge pull request #12939 from grafana/12865-login-loading-animation
animation during slow login
2018-08-27 15:17:19 +02:00
Patrick O'Carroll
1a2ab532d1 fixed so validation of empty fields works again 2018-08-27 14:16:34 +02:00
Patrick O'Carroll
5ff5c5c245 added a loading view with a spining grafana logo 2018-08-27 13:54:26 +02:00
Sven Klemm
7177f19436 Merge branch 'master' into postgres-query-builder 2018-08-27 11:23:55 +02:00
Sven Klemm
da8696ed95 fix handling of variable interpolation for IN expresions 2018-08-26 22:43:03 +02:00
Torkel Ödegaard
e1beaaa0f7 tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Torkel Ödegaard
35c00891e7 tslint: more const fixes (#13035) 2018-08-26 20:19:23 +02:00
Torkel Ödegaard
314b645857 tslint: changing vars -> const (#13034) 2018-08-26 18:43:07 +02:00
Torkel Ödegaard
9b978b7203 tslint: autofix of let -> const (#13033) 2018-08-26 17:14:40 +02:00
bergquist
fda9790ba5 upgrades to golang 1.11 2018-08-25 21:23:20 +02:00
Sven Klemm
21e7b0b92d add min interval to postgres datasource 2018-08-25 18:14:39 +02:00
Marcus Efraimsson
6995242b8b copy and docs update for alert notification reminders 2018-08-24 19:13:52 +02:00
Marcus Efraimsson
eba147c1a3 change/add tests for alerting notification reminders 2018-08-24 19:09:19 +02:00
Tobias Skarhed
8a99fa269d WIP Update tslint (#12922)
* Interface linting rule

* fix: changed model names in store files so that the interface names do not conflict with the model names
2018-08-24 16:48:47 +02:00
Marcus Efraimsson
e906d4bdba changelog: add notes about closing #12952 #12965
[skip ci]
2018-08-24 15:55:20 +02:00
Marcus Efraimsson
49f9276df0 Merge pull request #12967 from franciscocpg/custom-all-value-variable-interpolation
Replacing variable interpolation in "All value" value
2018-08-24 15:40:55 +02:00
Leonard Gram
5bb0d26604 build: fixes rpm build when using defaults.
Closes #12980
2018-08-24 15:23:49 +02:00
Marcus Efraimsson
51069c9ccb docs: reminder notifications update 2018-08-23 18:56:37 +02:00
Marcus Efraimsson
a9497f0a96 changelog: add notes about closing #12486
[skip ci]
2018-08-23 18:30:28 +02:00
Marcus Efraimsson
a04d531d35 Merge pull request #12999 from alexanderzobnin/fix-12486-cherry-pick
Heatmap: fix tooltip and crosshair in firefox
2018-08-23 18:27:59 +02:00
Marcus Efraimsson
b218290f3a docs: changes 2018-08-23 17:39:39 +02:00
Patrick O'Carroll
76bd173a36 created a section under administration for authentication, moved ldap guide here, created pages for auth-proxy, oauth, anonymous auth, ldap sync with grafana ee, and overview, moved authentication guides from configuration to, added linksin configuration page to guides 2018-08-23 15:58:37 +02:00
Patrick O'Carroll
050902a1e7 fixed so animation starts as soon as one pushes the button and animation stops if login failed 2018-08-23 15:31:25 +02:00
Patrick O'Carroll
d38c159893 added link to getting started to all, changed wording 2018-08-23 14:39:50 +02:00
Sven Klemm
ea110b5931 Merge branch 'master' into postgres-query-builder 2018-08-23 14:33:55 +02:00
Marcus Efraimsson
4db480ad7e Merge pull request #13012 from alexanderzobnin/fix-missing-jests
tests: fix missing tests (with .jest suffix)
2018-08-23 12:46:38 +02:00
Alexander Zobnin
060fb1af05 tests: fix missing tests (with .jest suffix) 2018-08-23 13:00:15 +03:00
Marcus Efraimsson
34e448c6d4 Merge remote-tracking branch 'origin/master' into alerting_reminder 2018-08-22 18:08:50 +02:00
Marcus Efraimsson
2e1c4b3d76 docs: alerting notification reminders 2018-08-22 18:06:51 +02:00
Marcus Efraimsson
15d950ce35 update copy/ux for configuring alerting notification reminders 2018-08-22 18:06:05 +02:00
Alexander Zobnin
8dc1675574 heatmap: fix tooltip bug in firefox 2018-08-22 15:36:17 +03:00
Sven Klemm
1b5486ae7f Merge branch 'master' into postgres-query-builder 2018-08-21 21:58:04 +02:00
Sven Klemm
02c5d36c0b fix tableSegment and timeColumnSegment after table suggestion 2018-08-21 20:12:45 +02:00
Marcus Efraimsson
97fbf5c033 Merge pull request #12994 from stefanes/patch-2
Update notifications.md
2018-08-21 18:23:03 +02:00
Stefan
2b1f84cd43 Update notifications.md 2018-08-21 15:53:57 +02:00
Torkel Ödegaard
5f81c879fa Merge branch 'code-migrations' 2018-08-21 13:53:46 +02:00
Torkel Ödegaard
92ed1f04af sql: added code migration type 2018-08-21 13:53:04 +02:00
Marcus Efraimsson
eef0d28082 changelog: add notes about closing #11890
[skip ci]
2018-08-21 10:51:38 +02:00
Marcus Efraimsson
775e95bde4 Merge pull request #12959 from grafana/11890_variables
Fix: Template variables are executing excessive queries
2018-08-21 10:40:47 +02:00
Marcus Efraimsson
6ace01fbed Merge pull request #12893 from grafana/davkal/12889-explore-fix-rate-filter
Explore: Fix label filtering for rate queries
2018-08-21 10:37:38 +02:00
Marcus Efraimsson
dc60848319 Merge pull request #12876 from grafana/davkal/explore-rate-hinting
Explore: still show rate hint if query is complex
2018-08-21 10:37:12 +02:00
Marcus Efraimsson
c970e1e4b8 Merge pull request #12874 from grafana/davkal/explore-facetting-filtered
Explore: Filter out existing labels in label suggestions
2018-08-21 09:59:53 +02:00
Marcus Efraimsson
dd796bfbe3 Merge remote-tracking branch 'origin/master' into davkal/12889-explore-fix-rate-filter 2018-08-21 09:51:17 +02:00
Marcus Efraimsson
75db4d8eee Merge remote-tracking branch 'origin/master' into davkal/explore-rate-hinting 2018-08-21 09:48:07 +02:00
Marcus Efraimsson
8f875951cb Merge remote-tracking branch 'origin/master' into davkal/explore-facetting-filtered 2018-08-21 09:40:39 +02:00
Marcus Efraimsson
352a26780c Merge pull request #12873 from grafana/davkal/explore-fix-split
Explore: Fix initial state in split view
2018-08-21 09:38:06 +02:00
David
6316d637f1 Explore: Apply tab completion suggestion on Enter (#12904)
- if the suggestions menu is open, apply the selected item on Enter
- if not open, run the queries
2018-08-20 19:22:55 +02:00
Pierre GIRAUD
72efd73c3b Show min-width option only for horizontal repeat (#12981) 2018-08-20 19:22:30 +02:00
Pierre GIRAUD
cf632c0f11 Fix bulk-dashboards path (#12978) 2018-08-20 19:21:31 +02:00
Marcus Efraimsson
470e7cc6db add suggestions for reminder frequency and change copy 2018-08-20 18:23:48 +02:00
Marcus Efraimsson
dfa5d17670 don't write to notification journal when testing notifier/rule 2018-08-20 16:27:13 +02:00
Marcus Efraimsson
86bc462bc1 remove unnecessary conversion (metalinter) 2018-08-20 13:35:36 +02:00
Marcus Efraimsson
3350a3477d fix after merge with master 2018-08-20 13:31:06 +02:00
Marcus Efraimsson
6d2136b853 Merge remote-tracking branch 'origin/master' into alerting_reminder 2018-08-20 13:29:30 +02:00
Marcus Efraimsson
887387cda8 Merge pull request #12974 from grafana/ds-proxy-json-data
dsproxy: interpolate route url
2018-08-20 13:22:57 +02:00
Francisco Guimarães
0223a75de0 Refresh query variable when another variable is used in regex field (#12961) 2018-08-20 11:56:12 +02:00
Pierre GIRAUD
a92d51731d Webpack tapable plugin deprecation (#12960)
* Remove unrequired extract-text-webpack-plugin

* Update ngAnnotate to avoid deprecation warning

* Avoid deprecation warning (Tapable.plugin -> hooks)
2018-08-20 11:55:29 +02:00
Sven Klemm
e04127e430 unify quoting 2018-08-18 16:09:12 +02:00
Daniel Lee
c75e071213 dsproxy: interpolate route url
Allows for dynamic urls for plugin routes. There are a few plugins
where the route url should be configurable and this change allows
using jsonData fields in the url field for a route in the
plugin.json file for a plugin.
2018-08-18 16:02:49 +02:00
Sven Klemm
49319fbdea prefill editor with first metric table 2018-08-18 13:21:08 +02:00
Sven Klemm
ff2564900f only allow 1 filter macro in where clause 2018-08-18 12:34:19 +02:00
Sven Klemm
c1890dbb6d fix timeColumnType assignment 2018-08-18 12:28:05 +02:00
Sven Klemm
9699d7a166 make suggested filter macro depend on type 2018-08-18 12:11:10 +02:00
Sven Klemm
18ce6fc280 use unixEpochGroup macro for unix timestamp 2018-08-18 12:04:32 +02:00
Sven Klemm
998bb6ebe3 Merge branch 'master' into postgres-query-builder 2018-08-18 11:54:39 +02:00
Leonard Gram
da2822c88d alerting: inline docs for the slack channel.
Related to #12944
2018-08-17 16:49:27 +02:00
Francisco Guimarães
d58986872c Replacing variable interpolation in "All value" value 2018-08-17 11:04:32 -03:00
Marcus Efraimsson
bcd876f88e changelog: add notes about closing #12229
[skip ci]
2018-08-17 15:40:44 +02:00
Marcus Efraimsson
88b96fbd15 Merge pull request #12921 from grafana/12229_provisioning
Provisioning: Should allow one default datasource per organisation
2018-08-17 15:37:32 +02:00
Marcus Efraimsson
2bb87446be Merge pull request #12955 from grafana/12951-login-buttons
Login button issue in light theme
2018-08-17 15:31:31 +02:00
Marcus Efraimsson
0a7be2618e cleaning up test data 2018-08-17 15:00:37 +02:00
Marcus Efraimsson
e3b585d862 changelog: add notes about closing #12892
[skip ci]
2018-08-17 14:44:29 +02:00
Marcus Efraimsson
313a8bd033 Merge pull request #12891 from svenklemm/unixepochgroup
add $__unixEpochGroup and $__unixEpochGroupAlias to sql datasources
2018-08-17 14:41:33 +02:00
Marcus Efraimsson
eaa169cc47 docs: es versions supported 2018-08-17 14:40:50 +02:00
Marcus Efraimsson
492f5cac92 devenv: update sql dashboards 2018-08-17 14:26:28 +02:00
Marcus Efraimsson
d6ad1ced6d when value in variable changes, identify which variable(s) to update
Given you have variables a, b, c, d where b depends on a, c depends on b, c, d depends on a.
When updating a only an update of b and d should be triggered since c depends on b
and c will be updated eventually when the update of b are finished.
2018-08-17 12:20:21 +02:00
Marcus Efraimsson
c76513119b Merge pull request #12947 from pgiraud/patch-1
Doc - fix broken link
2018-08-17 11:21:04 +02:00
Sven Klemm
4acf4f9d36 Merge branch 'master' into postgres-query-builder 2018-08-17 10:54:44 +02:00
Patrick O'Carroll
190432296d removed inverse btn styling and added bgColor to generic oauth and grafana.com login buttons, added styling so log in button uses dark theme inverse btn styling both for dark and light theme 2018-08-17 10:40:57 +02:00
Sven Klemm
8e4db8cc3a suggest operators depending on datatype 2018-08-17 10:38:23 +02:00
Pierre GIRAUD
d06c8c0e68 Doc - fix title level 2018-08-17 10:29:45 +02:00
Pierre GIRAUD
ea704fcf9b Update doc about repeating panels
There's no per-row contextual menu anymore
Instead there's a  option
2018-08-17 10:29:45 +02:00
Pierre GIRAUD
04d50fb405 Doc - fix broken link 2018-08-17 10:00:17 +02:00
Leonard Gram
cc50cfd9d3 build: beta versions no longer tagged as latest.
Closes #12862
2018-08-16 14:03:49 +02:00
Leonard Gram
0ce8a6a69d docs: cleanup. 2018-08-16 13:48:19 +02:00
Leonard Gram
d244b59cc1 docs: docker and restarts.
Closes #10784
2018-08-16 13:48:19 +02:00
Sven Klemm
28f97a2450 update persisted parts on param change 2018-08-16 13:23:38 +02:00
Sven Klemm
e84a1cbcc5 persist datatype information 2018-08-16 12:50:32 +02:00
Sven Klemm
8ced29a0e7 Don't do value suggestions for numeric and timestamp 2018-08-16 11:48:36 +02:00
Patrick O'Carroll
8877200ef4 created a class for loading buttons, added a button for when login slow on login page 2018-08-16 10:58:47 +02:00
Marcus Efraimsson
8af80b323a Merge pull request #12909 from grafana/ds-user-agent
Set User-Agent header in datasource proxied requests
2018-08-15 16:59:29 +02:00
Sven Klemm
735c4abe6c rename postgres_query.jest.ts to .test.ts 2018-08-15 12:06:32 +02:00
Sven Klemm
907e8fd77c fix variable escaping 2018-08-15 11:37:30 +02:00
Sven Klemm
a2f4441f9d autodetect timescaledb when version >= 9.6 2018-08-15 10:42:15 +02:00
Leonard Gram
713fac8e78 build: duplicate docker run-script removed. 2018-08-15 10:32:39 +02:00
Sven Klemm
2d12801186 detect postgres version for saved datasources 2018-08-15 09:48:06 +02:00
Marcus Efraimsson
13921902b5 Set User-Agent header in all proxied datasource requests
Header value will be Grafana/%version%, i.e. Grafana/5.3.0
2018-08-15 09:46:59 +02:00
Sven Klemm
2606f6e715 use pointer cursor for buttons in query editor 2018-08-15 09:21:17 +02:00
Marcus Efraimsson
b8671b201e Merge pull request #12879 from anwar6953/patch-1
Fix typo
2018-08-14 22:56:00 +02:00
Leonard Gram
6a8b1e14cc docs: cloudwatch dimensions reference link. 2018-08-14 16:42:20 +02:00
Sven Klemm
6d8ad3b076 require postgres 9.4+ for ordered set aggregate functions 2018-08-14 15:49:37 +02:00
Sven Klemm
9d022766ee add postgres version to datasource config 2018-08-14 15:45:55 +02:00
Sven Klemm
c90eb45cef only show first/last aggregate when timescaledb is enabled 2018-08-14 15:29:29 +02:00
Sven Klemm
e12d07dd68 keep jsonData in PostgresDatasource 2018-08-14 15:27:58 +02:00
Marcus Efraimsson
c5c518fd17 docs: remove message property in response from get alerts http api
Fixes #12524
2018-08-14 15:17:29 +02:00
Sven Klemm
5b3b0295e8 Merge branch 'master' into postgres-query-builder 2018-08-14 15:10:16 +02:00
Marcus Efraimsson
ad1cf6c2b8 changelog: add notes about closing #5623
[skip ci]
2018-08-14 14:55:07 +02:00
Marcus Efraimsson
d0d6f44dee Merge pull request #11314 from BenoitKnecht/gitlab-integration
GitLab authentication backend
2018-08-14 14:50:49 +02:00
Leonard Gram
570d2fede3 build: cleanup 2018-08-14 14:48:26 +02:00
Marcus Efraimsson
aed89b49c0 should allow one default datasource per organisation using provisioning 2018-08-14 14:48:14 +02:00
Leonard Gram
e521e7b76d build: fixes rpm verification. 2018-08-14 14:24:04 +02:00
Marcus Efraimsson
189de87619 docs: add grafana version note for gitlab oauth 2018-08-14 14:24:02 +02:00
Benoît Knecht
5a91e670d8 docs: gitlab: add note about more restrictive API scope
If `allowed_groups` is not used with GitLab authentication, the
*read_user* scope can be used instead of *api*.
2018-08-14 14:11:48 +02:00
Benoît Knecht
ce804e9981 social: gitlab_oauth: set user ID in case email changes
Set `BasicUserInfo.Id` in the value returned by
`SocialGitlab.UserInfo()`, in case the email address of the user changes
in GitLab. That way, the user association won't be lost in Grafana.
2018-08-14 14:11:48 +02:00
Benoît Knecht
47cb0c47fd docs: document GitLab authentication backend 2018-08-14 14:11:48 +02:00
Benoît Knecht
7ec146df99 social: add GitLab authentication backend
GitLab could already be used as an authentication backend by properly
configuring `auth.generic_oauth`, but then there was no way to authorize
users based on their GitLab group membership.

This commit adds a `auth.gitlab` backend, similar to `auth.github`, with
an `allowed_groups` option that can be set to a list of groups whose
members should be allowed access to Grafana.
2018-08-14 14:11:48 +02:00
Leonard Gram
aefcb06ff8 build: verifies the rpm packages signatures.
Closes #12370
2018-08-14 13:45:20 +02:00
Marcus Efraimsson
332e59d314 changelog: add notes about closing #12224
[skip ci]
2018-08-14 13:42:18 +02:00
Patrick O'Carroll
e6ea8f7e0b added guide for logging in to grafana for the first and how to add a datasource 2018-08-14 13:21:52 +02:00
Marcus Efraimsson
660530a3a6 Merge pull request #12914 from dehrax/12224-final
Karma to Jest: rename and cleanup
2018-08-14 12:55:23 +02:00
Sven Klemm
15c8ef6c95 Merge branch 'master' into postgres-query-builder 2018-08-14 12:51:03 +02:00
Marcus Efraimsson
de25a4fe4e docs: update 2018-08-14 12:40:07 +02:00
Torkel Ödegaard
a1ed3ae094 feat: add auto fit panels to shortcut modal, closes #12768 2018-08-14 12:26:08 +02:00
Marcus Efraimsson
3769df7119 changelog: add notes about closing #12680
[skip ci]
2018-08-14 12:16:46 +02:00
Marcus Efraimsson
74077be19e Merge pull request #12680 from svenklemm/timebucket
[postgres] add timescaledb option to postgres datasource
2018-08-14 12:12:43 +02:00
Marcus Efraimsson
6225efa50c docs: update postgres provisioning 2018-08-14 11:24:08 +02:00
Tobias Skarhed
86a2789541 Remove dependencies 2018-08-14 11:23:55 +02:00
Marcus Efraimsson
ddc83c2a72 Merge pull request #12897 from dehrax/12224-renderer
WIP Karma to Jest: heatmap renderer (refactor)
2018-08-14 11:16:48 +02:00
Marcus Efraimsson
77ee032e41 Merge pull request #12809 from dehrax/12224-share-modal-ctrl
Karma to Jest: share_modal_ctrl
2018-08-14 10:57:15 +02:00
Tobias Skarhed
a65589a5fb Rename test files 2018-08-14 10:52:41 +02:00
Marcus Efraimsson
b70d594c10 changelog: add notes about closing #12598
[skip ci]
2018-08-14 10:35:34 +02:00
Sven Klemm
a96d97e347 add version disclaimer for TimescaleDB 2018-08-14 10:26:08 +02:00
Marcus Efraimsson
03aed21d4b Merge pull request #12598 from kichristensen/TimeRangeVariables
Support timeFilter in query templating for InfluxDB
2018-08-14 10:24:21 +02:00
Sven Klemm
d33019ca67 document TimescaleDB datasource option 2018-08-14 10:22:57 +02:00
Sven Klemm
837388d13e Use variable in newPostgresMacroEngine 2018-08-14 09:44:58 +02:00
Tobias Skarhed
e696dc4d5f Remove Karma scripts and docs 2018-08-14 09:28:08 +02:00
Marcus Efraimsson
766d0bef17 changelog: add notes about closing #10705
[skip ci]
2018-08-14 09:19:37 +02:00
Torkel Ödegaard
4f704cec53 fix: ds_proxy test not initiating header 2018-08-14 09:18:23 +02:00
Marcus Efraimsson
8dbc75ceea Merge pull request #12844 from grafana/10705_dash_links
Use uid when linking to dashboards internally in a dashboard
2018-08-14 09:16:43 +02:00
Sven Klemm
3955133f7e Don't pass datasource to newPostgresMacroEngine 2018-08-14 09:15:24 +02:00
Tobias Skarhed
53bab1a84b Remove tests and logs 2018-08-14 09:15:14 +02:00
Torkel Ödegaard
0fa47c5ef4 Update CHANGELOG.md 2018-08-14 08:55:27 +02:00
Torkel Ödegaard
7e0482e78d Fix for Graphite function parameter quoting (#12907)
* fix: graphite function parameters should never be quoted for boolean, node, int and float types, fixes #11927

* Update gfunc.ts
2018-08-14 08:52:51 +02:00
Torkel Ödegaard
e37931b79d Update CHANGELOG.md 2018-08-14 08:52:30 +02:00
Marcus Efraimsson
36e808834d don't render hidden columns in table panel (#12911) 2018-08-14 08:50:22 +02:00
Torkel Ödegaard
277a696fa5 fix: added missing ini default keys, fixes #12800 (#12912) 2018-08-14 08:49:56 +02:00
Sven Klemm
3552a4cb86 refactor timescaledb handling in MacroEngine 2018-08-14 08:47:33 +02:00
Torkel Ödegaard
2459b177f9 change: Set User-Agent to Grafana/%Version% Proxied-DS-Request %DS-Type% in all proxied ds requests 2018-08-13 18:09:01 +02:00
Tobias Skarhed
fa6d25af72 Remove comment 2018-08-13 16:36:22 +02:00
Tobias Skarhed
be7b663369 Cleanup 2018-08-13 16:36:22 +02:00
Tobias Skarhed
38422ce8a4 All tests passing 2018-08-13 16:36:22 +02:00
Tobias Skarhed
35694a76ef Class to function. Half tests passing 2018-08-13 16:36:22 +02:00
Tobias Skarhed
739bee0207 Karma to Jest: graph (refactor) (#12860)
* Begin conversion

* Test setup started

* Begin rewrite of graph

* Rewrite as class

* Some tests passing

* Fix binding errors

* Half tests passing

* Call buildFlotPairs. More tests passing

* All tests passing

* Remove test test

* Remove Karma test

* Make methods out of event functions

* Rename GraphElement
2018-08-13 16:08:01 +02:00
Torkel Ödegaard
c521f51780 tech: removed js related stuff now that 99% is typescript (#12905) 2018-08-13 15:56:11 +02:00
Tobias Skarhed
472b880939 Add React container 2018-08-13 15:51:58 +02:00
Marcus Efraimsson
9031866caa changelog: add notes about closing #12805
[skip ci]
2018-08-13 15:51:19 +02:00
Marcus Efraimsson
4cebf38ff2 Merge pull request #12807 from nyxi/master
Support client certificates for LDAP servers
2018-08-13 15:48:39 +02:00
Marcus Efraimsson
39669e5002 fix redirect to panel when using an outdated dashboard slug (#12901) 2018-08-13 15:41:15 +02:00
David
1c185ef8d8 Add commit to external stylesheet url (#12902)
- currently only the release is used as a fingerprint which produces
  caching issues for all lastest master builds
- also add build commit to url fingerprint
- make bra also watch go html template files
2018-08-13 15:40:52 +02:00
Torkel Ödegaard
b0f3ca16d9 Update CHANGELOG.md 2018-08-13 15:40:37 +02:00
Marcus Efraimsson
b8a1385c77 build: increase frontend tests timeout without no output 2018-08-13 15:40:07 +02:00
Torkel Ödegaard
f2b1fabd5c fix: Alerting rendering timeout was 30 seconds, same as alert rule eval timeout, this should be much lower so the rendering timeout does not timeout the rule context, fixes #12151 (#12903) 2018-08-13 15:38:28 +02:00
Marcus Efraimsson
fd032c1111 changelog: add notes about closing #12476
[skip ci]
2018-08-13 15:18:33 +02:00
Marcus Efraimsson
d110343e53 Merge pull request #12838 from grafana/12476-show-teams-on-profile
show teams on profile
2018-08-13 15:16:04 +02:00
Patrick O'Carroll
535bab1baa now hides team header when no teams + fix for list hidden when only one team 2018-08-13 15:07:29 +02:00
Tobias Skarhed
e6057e08de Rename to HeatmapRenderer 2018-08-13 14:24:15 +02:00
Tobias Skarhed
2e2de38b31 Mock things 2018-08-13 13:55:47 +02:00
David Kaltschmidt
978e89657e Explore: Fix label filtering for rate queries
- exclude `]` from match expression for selector injection to ignore
  range vectors like `[10m]`
2018-08-13 12:53:12 +02:00
Sven Klemm
3f5d325e5b Merge branch 'master' into postgres-query-builder 2018-08-13 12:40:00 +02:00
Sven Klemm
8c4d59363e add $__unixEpochGroup to mssql datasource 2018-08-13 12:23:42 +02:00
Sven Klemm
fbc67a1c64 add $__unixEpochGroup to mysql datasource 2018-08-13 12:17:05 +02:00
Sven Klemm
bfe28ee061 Add $__unixEpochGroup macro to postgres datasource 2018-08-13 12:08:14 +02:00
Patrick O'Carroll
bdd9af0864 changed const members to filteredMembers to trigger get filtered members, changed input value to team.search (#12885) 2018-08-13 11:34:16 +02:00
Sven Klemm
c9bbdf244c get timecolumn datatype on timecolumn change 2018-08-13 11:29:35 +02:00
Marcus Efraimsson
edb34a36a0 changelog: add notes about closing #12882
[skip ci]
2018-08-13 11:16:49 +02:00
Leonard Gram
d7a0f5ee07 Removes link to deprecated docker image build 2018-08-13 11:14:24 +02:00
Tobias Skarhed
a79c43420a Add mocks 2018-08-13 10:57:32 +02:00
Marcus Efraimsson
c4a189ee52 Merge pull request #12880 from svenklemm/setupfillmode
Refactor setting fillmode
2018-08-13 10:47:35 +02:00
Sven Klemm
1dd8192d51 fix datatype query 2018-08-13 09:57:46 +02:00
Leonard Gram
aeba01237d Changelog update 2018-08-13 09:20:17 +02:00
Leonard Gram
48713b76f3 docker: makes it possible to set a specific plugin url.
Originally from the grafana/grafana-docker repo, authored
by @ClementGautier.
2018-08-13 09:17:44 +02:00
Torkel Ödegaard
974359534f Update CHANGELOG.md 2018-08-13 07:54:49 +02:00
Julien Pivotto
48364f0111 Add support for $__range_s (#12883)
Fixes #12882

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-08-13 07:53:41 +02:00
Sven Klemm
d81a23becf Refactor setting fillmode
This adds SetupFillmode to the tsdb package to be used by the sql
datasources.
2018-08-12 10:51:58 +02:00
Sven Klemm
d8606ddfb0 Merge branch 'master' into postgres-query-builder 2018-08-12 10:02:18 +02:00
Ali Anwar
5fd8849d65 Update dashboard.md 2018-08-11 23:44:15 -07:00
Ali Anwar
8d2aac0936 Fix typo 2018-08-11 23:42:31 -07:00
David Kaltschmidt
87745e6e44 Explore: label selector for logging
- query all available label keys for logs
- query all values for each key
- build cascader options with label values by key
- lots of temporarily added conditions to reuse the promquery field
2018-08-10 16:41:21 +02:00
Tobias Skarhed
520aad819d Replace element 2018-08-10 16:30:51 +02:00
Tobias Skarhed
076bfea362 Rewrite heatmap to class 2018-08-10 15:35:47 +02:00
David Kaltschmidt
0f5945c557 Explore: still show rate hint if query is complex
- action hint currently only works for very simple queries
- show a hint w/o action otherwise
2018-08-10 15:29:21 +02:00
David Kaltschmidt
a0fbe3c296 Explore: Filter out existing labels in label suggestions
- a valid selector returns all possible labels from the series API
- we only want to suggest the label keys that are not part of the
  selector yet
2018-08-10 14:45:09 +02:00
Daniel Lee
1f88bfd2bc Add note for #12843 2018-08-10 14:02:51 +02:00
Daniel Lee
2770a7bc0c Merge pull request #12843 from pgiraud/plugin_readme_links
Convert URL-like text to links in plugins readme
2018-08-10 14:01:05 +02:00
Daniel Lee
c2b4bbcfc0 Merge pull request #12848 from waderobson/patch-1
Add example OR search_filter to docs
2018-08-10 13:47:31 +02:00
Daniel Lee
71630e4a7b Merge pull request #12856 from grafana/12855-team-members-delete-button
Delete button for team members page
2018-08-10 13:46:13 +02:00
David Kaltschmidt
e832f91fb6 Fix initial state in split explore
- remove `edited` from query state to reset queries
- clear more properties in state
2018-08-10 13:37:15 +02:00
Patrick O'Carroll
277c735814 replaced with EmptyListCta 2018-08-10 11:31:35 +02:00
Tobias Skarhed
9188f7423c Begin conversion 2018-08-10 09:35:19 +02:00
Patrick O'Carroll
1d1370d11d changed messaging 2018-08-10 08:27:22 +02:00
Sven Klemm
a4a33d80db mention time_bucket in timescaledb tooltip 2018-08-09 17:30:46 +02:00
Marcus Efraimsson
1bb3cf1c31 keep legend scroll position when series are toggled (#12845) 2018-08-09 16:04:56 +03:00
David
b9f4666821 Merge pull request #12846 from grafana/davkal/explore-rules-expansion
Explore: expand recording rules for queries
2018-08-09 14:34:08 +02:00
Patrick O'Carroll
f339b3502a replaced confirm delete modal with deleteButton component in teams members list 2018-08-09 12:56:55 +02:00
Patrick O'Carroll
584a9cd942 [wip]added empty list cta to team list, if statement toggles view for when the list is empty or not 2018-08-09 11:05:20 +02:00
David
1c63f7a61f Update NOTICE.md 2018-08-09 10:51:04 +02:00
David Kaltschmidt
9d66eeb10c Fix padding for metrics chooser in explore 2018-08-09 10:21:54 +02:00
Sven Klemm
d2984f3b0f fix rebase error 2018-08-09 10:14:14 +02:00
Sven Klemm
acd1acba2d revert passing ctrl to testDatasource 2018-08-09 10:05:35 +02:00
Sven Klemm
c3aad10047 change timescaledb to checkbox instead of select 2018-08-09 10:05:35 +02:00
Sven Klemm
b987aee7cf add timescaledb option to postgres datasource
This adds an option to the postgres datasource config for
timescaledb support. When set to auto it will check for
timescaledb when testing the datasource.

When this option is enabled the $__timeGroup macro will
use the time_bucket function from timescaledb to group
times by an interval.

This also passes the datasource edit control to testDatasource
to allow for setting additional settings, this might be useful
for other datasources aswell which have optional or version
dependant features which can be queried.
2018-08-09 10:05:35 +02:00
Leonard Gram
d48f1f57f0 build: fixes png rendering in the docker based docker-image build. 2018-08-09 09:10:53 +02:00
Dan Cech
8d0a100b94 remove duplicated /tmp entry in .dockerignore 2018-08-09 09:10:53 +02:00
Dan Cech
c025490518 move run script, update README 2018-08-09 09:10:53 +02:00
Dan Cech
96d6657b00 produce an image compatible with grafana-docker 2018-08-09 09:10:53 +02:00
Lorenz Brun
c89f21ba29 More efficient builds and some fixes to the Go binaries 2018-08-09 09:10:53 +02:00
Lorenz Brun
a5d1fb7e56 Simple Docker-based build option
This Dockerfile allows anyone with a recent version of Docker to quickly build a fully working Grafana container without any local build tooling. Pulling the sources from Git and calling `docker build .` is enough.
2018-08-09 09:10:53 +02:00
Wade Robson
62a25a4f28 Add example OR search_filter to docs 2018-08-08 09:13:28 -07:00
David Kaltschmidt
128a5d98e1 Explore: expand recording rules for queries
- load recording rules from prometheus
- map rule name to rule query
- query hint to detect recording rules in query
- click on hint fix expands rule name to query
2018-08-08 16:56:21 +02:00
David
c1b9bbc2cf Explore: Query hints for prometheus (#12833)
* Explore: Query hints for prometheus

- time series are analyzed on response
- hints are shown per query
- some hints have fixes
- fix rendered as link after hint
- click on fix executes the fix action

* Added tests for determineQueryHints()

* Fix index for rate hints in explore
2018-08-08 17:50:30 +03:00
Pierre GIRAUD
d7fb704e27 Convert URL-like text to links in plugins readme 2018-08-08 16:07:33 +02:00
Marcus Efraimsson
e97251fe28 skip target _self to remove full page reload 2018-08-08 16:01:35 +02:00
Marcus Efraimsson
8dfe4a97ef use uid when linking to dashboards internally in a dashboard 2018-08-08 16:01:01 +02:00
Sven Klemm
13d0fa4b9a add previous fill mode to query builder 2018-08-08 12:23:41 +02:00
Sven Klemm
3b6454ab88 Merge branch 'master' into postgres-query-builder 2018-08-08 12:09:17 +02:00
Patrick O'Carroll
a94406ac53 added more info about the teams 2018-08-08 11:22:47 +02:00
Patrick O'Carroll
ca06893e69 removed mock-teams, now gets teams from backend 2018-08-08 10:50:27 +02:00
Marcus Efraimsson
817179c097 changelog: add notes about closing #12756
[skip ci]
2018-08-08 10:33:30 +02:00
Marcus Efraimsson
8952137ea2 Merge pull request #12753 from svenklemm/sql-fillmode-last
Add fill mode to fill in previously seen value when point is missing to SQL datasources
2018-08-08 10:29:56 +02:00
Marcus Efraimsson
beddfdd86b add api route for retrieving teams of signed in user 2018-08-08 10:26:05 +02:00
Marcus Efraimsson
9938835dde devenv: update sql dashboards 2018-08-08 09:47:45 +02:00
Patrick O'Carroll
b0ddc15e1a team list for profile page + mock teams 2018-08-08 09:23:36 +02:00
Marcus Efraimsson
89298d0cf5 Merge pull request #12815 from tariq1890/url_query_fix
Fixing bug in url query reader and added test cases
2018-08-08 09:18:32 +02:00
Marcus Efraimsson
a6a29f0b20 changelog: add notes about closing #11270
[skip ci]
2018-08-08 09:13:44 +02:00
Marcus Efraimsson
c67bec5487 Merge pull request #12834 from grafana/11270_secret_fields
Fix issue with secret fields after updating datasource
2018-08-08 09:11:07 +02:00
Marcus Efraimsson
77b561cf14 Merge pull request #12835 from bdeluca/patch-1
fix missing *
2018-08-08 09:02:58 +02:00
tariq1890
e8dfbe94b1 Fixing bug in url query reader and added test cases 2018-08-07 18:43:59 -07:00
Ben de Luca
a156b6ee06 fix missing *
The missing * causes the text to be in the box to be displayed incorrectly.
2018-08-07 22:32:02 +02:00
Sven Klemm
52c7edf2f4 rename last fillmode to previous 2018-08-07 21:11:51 +02:00
Sven Klemm
ee7602ec1f change fillmode from last to previous 2018-08-07 21:01:41 +02:00
David
91d04b87ad Merge pull request #12821 from grafana/davkal/explore-query-ux
Explore: prometheus query helpers
2018-08-07 17:56:08 +02:00
Marcus Efraimsson
eb1b9405b2 return proper payload from api when updating datasource 2018-08-07 17:56:02 +02:00
David Kaltschmidt
2961c3b3b9 Review feedback
- use color variables for cascader styles
- fix Table value type
2018-08-07 17:42:00 +02:00
Marcus Efraimsson
e9746db5ab changelog: update #12768
[skip ci]
2018-08-07 17:02:46 +02:00
Marcus Efraimsson
cfe81510f9 Merge pull request #12796 from dehrax/12768-panel-heights
WIP: Fit panels to screen height
2018-08-07 15:57:40 +02:00
Tobias Skarhed
2ad358215a Remove window 2018-08-07 14:49:11 +02:00
Tobias Skarhed
a0da66610e Fix url param errors 2018-08-07 14:48:22 +02:00
David Kaltschmidt
642374de25 Explore: Metrics chooser for prometheus
- load all histogrammable metrics on start, based on `{le!=''}` series
  query
- select dropdown shows all those metrics as well as histograms in a
  special group
- select a metric will write fill the metric in the query box
- if a histogram is chosen, it will write a complete
  `histogram_quantile` query
- added new dependency: rc-cascader
2018-08-07 13:43:32 +02:00
David Kaltschmidt
307248f713 Add clear row button
- clears the content of a query row
2018-08-07 13:43:32 +02:00
David Kaltschmidt
00f04f4ea0 Add clear button to Explore
- Clear All button to clear all queries and results
- moved result viewer buttons below query rows to make it more clear
  that they govern result options
2018-08-07 13:42:32 +02:00
David
f43735ac25 Merge pull request #12813 from grafana/davkal/explore-empty-results
Explore: show message if queries did not return data
2018-08-07 13:40:32 +02:00
David Kaltschmidt
f1c1633d15 Explore: show message if queries did not return data
- every result viewer displays a message that it received an empty data
  set
2018-08-07 13:03:33 +02:00
David
0f94d2f5f1 Fix closing parens completion for prometheus queries in Explore (#12810)
- position was determined by SPACE, but Prometheus selectors can
  contain spaces
- added negative lookahead to check if space is outside a selector
- moved braces plugin into PromQueryField since braces are prom specific
2018-08-07 13:34:12 +03:00
Torkel Ödegaard
4a387a9655 Update ROADMAP.md 2018-08-07 11:43:04 +02:00
Torkel Ödegaard
433b0abf6d Update ROADMAP.md 2018-08-07 11:36:17 +02:00
Torkel Ödegaard
e115e600db Update ROADMAP.md 2018-08-07 11:35:05 +02:00
David
34761205fd Merge pull request #12799 from grafana/davkal/explore-history
Explore: Add history to query fields
2018-08-06 17:46:15 +02:00
Leonard Gram
a73fc4a688 Smaller docker image (#12824)
* build: makes the grafana docker image smaller.

* build: branches and PR:s builds the docker image.
2018-08-06 17:34:25 +02:00
Marcus Efraimsson
b3c25076d0 Merge pull request #12746 from grafana/11305_mssql_logo
Mssql: add logo
2018-08-06 17:19:53 +02:00
Marcus Efraimsson
8a1b620551 Merge pull request #12823 from dadosch/master
unix socket docs
2018-08-06 17:12:40 +02:00
Leonard Gram
0d9870d9f1 build: failing to push to docker hub fails the build. 2018-08-06 16:26:59 +02:00
David Kaltschmidt
cda3b01781 Reversed history direction for explore
- _.reverse() was modifying state.history
2018-08-06 14:45:03 +02:00
David Kaltschmidt
eaff7b0f68 Explore: Add history to query fields
- queries are saved to localstorage history array
- one history per datasource type (plugin ID)
- 100 items kept with timestamps
- history suggestions can be pulled up with Ctrl-SPACE
2018-08-06 14:45:03 +02:00
dadosch
4e33314c14 unix socket docs 2018-08-06 14:40:30 +02:00
Leonard Gram
dc60828407 Merge pull request #12798 from grafana/grafana-docker
Merges the Grafana docker build into the main repository.
2018-08-06 14:39:51 +02:00
David
5da3584dd4 Explore: facetting for label completion (#12786)
* Explore: facetting for label completion

- unified metric and non-metric label completion
- label keys and values are now fetched fresh for each valid selector
- complete selector means only values are suggested that are supported
  by the selector
- properly implemented metric lookup for selectors (until the first
  metric was used which breaks when multiple metrics are present)
- typeahead tests now need a valid selection to demark the cursor

* Fix facetting queries for empty selector
2018-08-06 15:36:02 +03:00
Leonard Gram
3096905d39 docs: how to build a docker image. 2018-08-06 14:16:35 +02:00
Marcus Efraimsson
e60d0c12f5 Merge pull request #12787 from dehrax/12224-variable-srv
Karma to Jest: variable_srv
2018-08-06 11:34:43 +02:00
Tobias Skarhed
9f87f6081a Remove Karma test 2018-08-06 11:23:50 +02:00
Tobias Skarhed
46dd4eba9e All tests passing 2018-08-06 11:23:50 +02:00
Tobias Skarhed
034ca69610 Add mock constructor 2018-08-06 11:23:50 +02:00
Tobias Skarhed
7f4723a9a7 Begin conversion 2018-08-06 11:23:50 +02:00
Marcus Efraimsson
ca0339fb48 Merge pull request #12819 from dehrax/12224-opentsdb-ds
Karma to Jest: OpenTSDB datasource
2018-08-06 11:22:01 +02:00
Tobias Skarhed
ccd964e1df Convert query control 2018-08-06 10:57:58 +02:00
Tobias Skarhed
45eadae692 Convert datasource 2018-08-06 10:42:35 +02:00
Torkel Ödegaard
624f3a0173 refactor: take submenu into account PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard
b1b8a38061 refactor: renaming variables, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard
013f8cd8ea refactor: moving code around a bit, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Tobias Skarhed
f00b5eee83 Remove weird import 2018-08-05 11:39:46 +02:00
Tobias Skarhed
4b84a58575 Disable submenu when autopanels is enabled 2018-08-05 11:39:46 +02:00
Tobias Skarhed
36c406eefb Extract to own method 2018-08-05 11:39:46 +02:00
Tobias Skarhed
1618b095c7 Use and add keybard shortcut 2018-08-05 11:39:46 +02:00
Tobias Skarhed
63fa9fdc6d Add temporary url parameter 2018-08-05 11:39:46 +02:00
Tobias Skarhed
338a37abc8 Replace floor with round 2018-08-05 11:39:46 +02:00
Tobias Skarhed
9e4748e2aa Go with just single margin compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed
78b3dc40f1 Add margin and padding compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed
a9f24bb36d Remove weird import 2018-08-05 11:39:45 +02:00
Tobias Skarhed
818fe09a7f Fit panels to screen height 2018-08-05 11:39:45 +02:00
Sven Klemm
6d07d825e9 dont break default parameters for functions 2018-08-03 18:38:40 +02:00
Sven Klemm
e4ae8be9fa fix suggestion query 2018-08-03 14:09:41 +02:00
Marcus Efraimsson
6f1b125c48 Merge pull request #12808 from dehrax/12224-simple
Karma to Jest: remove tests
2018-08-03 13:38:57 +02:00
David Kaltschmidt
c900a30106 renamed slate unit tests to .jest.ts 2018-08-03 13:09:05 +02:00
Tobias Skarhed
61eb96ed79 Remove simple tests 2018-08-03 12:34:13 +02:00
Emil Flink
5bea54eaaa Support client certificates for LDAP servers 2018-08-03 12:00:20 +02:00
Tobias Skarhed
61e3a0cceb Begin conversion 2018-08-03 11:57:03 +02:00
David
bda49fcaa2 Add click on explore table cell to add filter to query (#12729)
* Add click on explore table cell to add filter to query

- move query state from query row to explore container to be able to set
  modified queries
- added TS interface for columns in table model
- plumbing from table cell click to datasource
- add modifyQuery to prometheus datasource
- implement addFilter as addLabelToQuery with tests

* Review feedback

- using airbnb style for Cell declaration
- fixed addLabelToQuery for complex label values
2018-08-03 11:20:13 +03:00
Sven Klemm
aa830211fe dont order for aggregate 2018-08-03 10:15:28 +02:00
Leonard Gram
0ff54d257a build: makes it easier to build a local docker container. 2018-08-03 09:40:02 +02:00
Sven Klemm
dabfd88cd9 add moving average to query builder 2018-08-03 07:44:36 +02:00
Sven Klemm
0b57e88f9e adjust frontend test 2018-08-03 06:19:53 +02:00
Sven Klemm
2cae966e6c use $__timeGroupAlias macro 2018-08-02 21:40:15 +02:00
Sven Klemm
5c25844cd9 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 21:11:16 +02:00
Sven Klemm
83d7ec1da2 specify grafana version for last fill mode 2018-08-02 20:37:41 +02:00
Sven Klemm
bfc66a7ed0 add fillmode "last" to sql datasource
This adds a new fill mode last (last observation carried forward) for grafana
to the sql datasources. This fill mode will fill in the last seen value in a
series when a timepoint is missing or NULL if no value for that series has
been seen yet.
2018-08-02 20:35:09 +02:00
Leonard Gram
b61ac546f1 build: disables external docker build for master and release. 2018-08-02 19:24:05 +02:00
Leonard Gram
99a9dbb04f build: complete docker build for master and releases. 2018-08-02 19:24:05 +02:00
Leonard Gram
424aa6e564 build: removes unused args to docker build. 2018-08-02 19:24:05 +02:00
Leonard Gram
580e2c36d1 build: imported latest changes from grafana-docker. 2018-08-02 19:24:05 +02:00
Leonard Gram
e848930476 build: attach built resources. 2018-08-02 19:24:05 +02:00
Leonard Gram
e3a907214d build: builds docker image from local grafna tgz. 2018-08-02 19:24:05 +02:00
Leonard Gram
bfe41d3cf1 build: new workflow for PR:s and branches. 2018-08-02 19:24:05 +02:00
Leonard Gram
62d3655da4 docker: inital copy of the grafana-docker files. 2018-08-02 19:24:05 +02:00
Marcus Efraimsson
72af8a7044 changelog: add notes about closing #1823 #12801
[skip ci]
2018-08-02 18:57:13 +02:00
Marcus Efraimsson
116c4f2bff Merge pull request #12802 from gzzo/patch-1
Add auto_assign_org_id to defaults.ini
2018-08-02 18:49:43 +02:00
gzzo
cb76fc7f2d Add auto_assign_org_id to defaults.ini
For #12801
2018-08-02 12:29:47 -04:00
Marcus Efraimsson
7f85dd055e changelog: add notes about closing #12749
[skip ci]
2018-08-02 16:44:29 +02:00
Sven Klemm
67edb9e9fe Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 16:39:27 +02:00
Marcus Efraimsson
e5178b7d1d changelog: add notes about closing #12766
[skip ci]
2018-08-02 16:37:52 +02:00
Marcus Efraimsson
5cca478656 Merge pull request #12760 from svenklemm/postgres-timegroup
remove alias from postgres $__timeGroup macro

add $__timeGroupAlias macro to all sql datasources
2018-08-02 16:36:01 +02:00
Marcus Efraimsson
4d3e435298 Merge pull request #12774 from grafana/12766-table-colored-cell-link
table link color fix
2018-08-02 16:32:09 +02:00
Marcus Efraimsson
7f4f130a80 adjust test dashboards 2018-08-02 16:21:49 +02:00
Marcus Efraimsson
4962bf9d44 remove info logging 2018-08-02 15:49:50 +02:00
Patrick O'Carroll
ff0ca6b7e2 added two new classes for color, fixed so link has value color 2018-08-02 15:25:48 +02:00
Marcus Efraimsson
76f131aa80 changelog: add notes about closing #12063
[skip ci]
2018-08-02 15:09:23 +02:00
Marcus Efraimsson
c074c842e6 Merge pull request #12063 from A21z/patch-1
Add new Redshift metrics and dimensions for Cloudwatch datasource
2018-08-02 15:05:24 +02:00
Alban Perillat-Merceroz
f3d400f1a7 Add new Redshift metrics and dimensions for Cloudwatch datasource
AWS/Redshift has new dimensions (`latency`, `service class`, `wmlid`) and metrics (`QueriesCompletedPerSecond`, `QueryRuntimeBreakdown`, `QueryDuration`,  `WLMQueriesCompletedPerSecond`, `WLMQueryDuration`, `WLMQueueLength`) in Cloudwatch: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/rs-metricscollected.html
2018-08-02 14:45:24 +02:00
Marcus Efraimsson
ae0d7a3a5d changelog: add notes about closing #12752
[skip ci]
2018-08-02 12:54:33 +02:00
Marcus Efraimsson
de1a0e4789 changelog: update
[skip ci]
2018-08-02 12:51:23 +02:00
andig
57910549b6 Improve iOS and Windows 10 experience (#12769)
* Improve iOS homescreen icon

* Improve Windows10 tile experience

* Remove unused favicon
2018-08-02 03:37:50 -07:00
Torkel Ödegaard
169fcba520 Update CHANGELOG.md 2018-08-02 11:51:41 +02:00
Mitsuhiro Tanda
04fcd2a054 add series override option to hide tooltip (#12378)
* add series override option to hide tooltip

* fix test

* invert option

* fix test

* remove initialization
2018-08-02 02:49:40 -07:00
Marcus Efraimsson
a8976f6c36 changelog: add notes about closing #12785
[skip ci]
2018-08-02 11:43:48 +02:00
Marcus Efraimsson
9fa779315e Merge pull request #12791 from eMerzh/fix_quote
fix custom variable quoting in sql* query interpolations
2018-08-02 11:37:46 +02:00
Patrick O'Carroll
b03e3242e3 removed table-panel-link class 2018-08-02 11:21:17 +02:00
Patrick O'Carroll
36d981597e removed table-panel-link class and add a class white to modify table-panel-cell-link class 2018-08-02 11:18:21 +02:00
Sven Klemm
7e9c9199c1 add warning when switching from raw sql mode 2018-08-02 10:15:53 +02:00
Sven Klemm
a221d9ec84 add more prominent button for switching edit mode 2018-08-02 09:50:21 +02:00
Sven Klemm
5c3b80b492 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 09:17:21 +02:00
Sven Klemm
82c473e3af document $__timeGroupAlias 2018-08-01 21:23:00 +02:00
Sven Klemm
b71d10a7a4 add $__timeGroupAlias to mysql and mssql 2018-08-01 20:58:51 +02:00
Brice Maron
bb7e583863 fix custom variable quoting in sql* query interpolations 2018-08-01 20:32:50 +02:00
Marcus Efraimsson
9d3743774d Merge pull request #12771 from dehrax/12224-prometheus-ds
Karma to Jest: prometheus datasource
2018-08-01 15:06:36 +02:00
Sven Klemm
dc22e24642 add compatibility code to handle pre 5.3 usage 2018-08-01 15:06:18 +02:00
Tobias Skarhed
951b623bd2 Change to arrow functions 2018-08-01 14:27:45 +02:00
Tobias Skarhed
af32bfebef Add all tests to one file 2018-08-01 14:26:29 +02:00
Marcus Efraimsson
8d0c4cdc09 changelog: add notes about closing #12561
[skip ci]
2018-08-01 12:30:50 +02:00
Marcus Efraimsson
951679d50b Merge pull request #12561 from activeshadow/aws-rds-burst-balance
Added BurstBalance metric to list of AWS RDS metrics.
2018-08-01 12:28:15 +02:00
Tobias Skarhed
790aadf8ef Remove angularMocks 2018-08-01 10:09:05 +02:00
Tobias Skarhed
d6158bc293 All tests passing 2018-08-01 09:30:26 +02:00
Patrick O'Carroll
d4d896ade8 replaced style with class for links 2018-08-01 09:08:17 +02:00
Sven Klemm
42f1892826 Add $__timeGroupAlias to postgres macros 2018-08-01 09:03:34 +02:00
Sven Klemm
bd77541e09 adjust test dashboards 2018-08-01 08:52:11 +02:00
Sven Klemm
43295f9c18 remove alias from postgres $__timeGroup macro 2018-08-01 08:50:19 +02:00
Marcus Efraimsson
6df3722a35 changelog: add notes about closing #12762
[skip ci]
2018-07-31 18:01:36 +02:00
Marcus Efraimsson
dfda51a9be Merge pull request #12762 from sohonet/add_cloudwatch_aws_dx
add AWS/DX metrics and dimension to cloudwatch
2018-07-31 17:58:32 +02:00
Torkel Ödegaard
89eae1566d fix: team email tooltip was not showing 2018-07-31 17:31:45 +02:00
Torkel Ödegaard
276a5e6eb5 fix: test data api route used old name for test data datasource, fixes #12773 2018-07-31 17:29:02 +02:00
Patrick O'Carroll
4b8ec4e323 removed a blank space in div 2018-07-31 13:07:43 +02:00
Sven Klemm
b8af68e05a Merge branch 'master' into postgres-query-builder 2018-07-31 13:04:27 +02:00
Patrick O'Carroll
7b5b94607b fixed color for links in colored cells by adding a new variable that sets color: white when cell or row has background-color 2018-07-31 12:51:07 +02:00
Marcus Efraimsson
f1f0400769 changelog: add notes about closing #12300
[skip ci]
2018-07-31 11:41:58 +02:00
Marcus Efraimsson
3cecc0b54e Merge pull request #12301 from franciscocpg/cloudwatch-app-sync
Adding Cloudwatch AWS/AppSync metrics and dimensions
2018-07-31 11:38:31 +02:00
Tobias Skarhed
e4c2476f3c Weird execution order for the tests... 2018-07-31 09:35:08 +02:00
Marcus Efraimsson
ad84a145f5 changelog: add notes about closing #12744
[skip ci]
2018-07-30 17:03:24 +02:00
Marcus Efraimsson
162d3e8036 changelog: add notes about closing #12727
[skip ci]
2018-07-30 17:03:01 +02:00
Marcus Efraimsson
49430f7557 Merge pull request #12744 from Worty/master
change units to include characters for power of 2 and 3
2018-07-30 16:59:12 +02:00
Jason Pereira
88d8072be3 add aws_dx to cloudwatch datasource 2018-07-30 15:51:15 +01:00
Worty
4fa979649c also fixed "Watt per square metre" 2018-07-30 16:28:19 +02:00
Worty
9c0fbe5a0b fixed that missing one 2018-07-30 16:19:31 +02:00
Sven Klemm
6613f11499 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-30 15:23:56 +02:00
Marcus Efraimsson
e648ed197f Merge pull request #12679 from svenklemm/postgres-metric-prefix
Use metric column as prefix when returning multiple value columns
2018-07-30 14:50:11 +02:00
Sven Klemm
8a22129177 add version note to metric prefix and fix typo 2018-07-30 14:37:23 +02:00
Marcus Efraimsson
917b6b11b0 devenv: update sql dashboards 2018-07-30 13:54:57 +02:00
Marcus Efraimsson
38a52c2489 mssql: update tests 2018-07-30 13:50:52 +02:00
Marcus Efraimsson
e32cf75c2d fix usage of metric column types so that you don't need to specify metric alias 2018-07-30 13:50:18 +02:00
Tobias Skarhed
3d4a346c66 Begin conversion 2018-07-30 13:02:08 +02:00
Marcus Efraimsson
e4983cba2f changelog: update
[skip ci]
2018-07-30 10:21:22 +02:00
Marcus Efraimsson
13a7b638bc changelog: add notes about closing #12747
[skip ci]
2018-07-30 10:19:51 +02:00
Jan Garaj
e37e8cb38c Add missing tls_skip_verify_insecure (#12748) 2018-07-30 00:02:16 -07:00
Sven Klemm
ace999b13f rename special to windows 2018-07-29 15:56:22 +02:00
Sven Klemm
26ea88252b add first and last support 2018-07-29 15:00:13 +02:00
Sven Klemm
d7ddab958e Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-29 13:41:41 +02:00
Sven Klemm
412bb6acab refactor function handling in query builder 2018-07-29 13:31:50 +02:00
Sven Klemm
5327580939 refactor column function handling 2018-07-28 21:41:23 +02:00
Sven Klemm
6ca7a03975 consistent nameing fro group and select 2018-07-28 12:53:36 +02:00
Marcus Efraimsson
20b2b344f6 mssql: add logo 2018-07-28 11:31:30 +02:00
Sven Klemm
3aa4790979 add tests for metric column prefix to mssql 2018-07-27 18:13:19 +02:00
Sven Klemm
e487fabcd5 add metric column prefix test for mysql 2018-07-27 17:59:59 +02:00
Sven Klemm
036647ae35 document metric column prefix in query editor 2018-07-27 17:18:45 +02:00
Marcus Efraimsson
8188679951 Merge pull request #12745 from dehrax/12224-heatmap-ctrl
Karma to Jest: heatmap_ctrl
2018-07-27 17:18:15 +02:00
Marcus Efraimsson
710566e146 Merge pull request #12742 from dehrax/12224-backend-srv
Karma to Jest: backend_srv
2018-07-27 17:17:54 +02:00
Marcus Efraimsson
86d75a64c1 Merge pull request #12737 from dehrax/12224-singlestat
Karma to Jest: singlestat
2018-07-27 17:17:09 +02:00
Sven Klemm
bc9b6ddefe document metric column prefix for mysql and mssql 2018-07-27 17:14:27 +02:00
Tobias Skarhed
805dc3542f Remove extra mock 2018-07-27 16:46:41 +02:00
Tobias Skarhed
26f709e87e Karm to Jest 2018-07-27 16:45:03 +02:00
Worty
895b4b40ee correct volume unit 2018-07-27 16:26:04 +02:00
Tobias Skarhed
c11d0f5cc6 Remove lo 2018-07-27 15:52:22 +02:00
Tobias Skarhed
2f6b302375 Test passing. Remove Karma 2018-07-27 15:51:56 +02:00
Sven Klemm
7905c29875 adjust metric prefix code to sql engine refactor 2018-07-27 15:34:04 +02:00
Sven Klemm
f9d6c88a55 add testcase for metric column as prefix 2018-07-27 15:32:54 +02:00
Sven Klemm
b28a362635 Use metric column as prefix
If multiple value columns are returned and a metric column is
returned aswell the metric column will be used as prefix for
the series name
2018-07-27 15:32:53 +02:00
Tobias Skarhed
766c23a1eb Fix emit errors 2018-07-27 15:16:19 +02:00
Tobias Skarhed
2db4a54f75 Fix test 2018-07-27 14:40:56 +02:00
Tobias Skarhed
4e6168f3a3 Add async/await 2018-07-27 14:22:48 +02:00
Marcus Efraimsson
715c82b67b Merge pull request #12740 from grafana/unused-class-from-deletebutton
removed unused class from the deletebutton pr
2018-07-27 14:13:41 +02:00
Marcus Efraimsson
02ba467bf1 Merge pull request #12730 from marefr/sql_refactor
SQL datasources - backend refactor
2018-07-27 14:13:19 +02:00
Sven Klemm
ad26a319c5 refactor schema query generation 2018-07-27 14:02:12 +02:00
Patrick O'Carroll
971e52ecc9 removed unused class from the deletebutton pr 2018-07-27 13:48:14 +02:00
Patrick O'Carroll
1bb5a57036 frontend part with mock-team-list 2018-07-27 13:45:16 +02:00
Tobias Skarhed
55111c801f Update test for local time 2018-07-27 13:41:07 +02:00
Marcus Efraimsson
b4ac3f2379 update devenv datasources and dashboards for sql datasources 2018-07-27 13:33:50 +02:00
Tobias Skarhed
67c613a45a Begin conversion 2018-07-27 13:29:57 +02:00
Marcus Efraimsson
e43feb7bfa use const for rowlimit in sql engine 2018-07-27 13:21:40 +02:00
Marcus Efraimsson
0550ec6de1 Merge pull request #12665 from grafana/9863-animated-delete-button
built a component for delete button in tables
2018-07-27 12:37:53 +02:00
Sven Klemm
734118de86 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-27 11:52:38 +02:00
Tobias Skarhed
bff7a29356 Cleanup 2018-07-27 11:34:14 +02:00
Tobias Skarhed
3d21e42aac Remove Karma file 2018-07-27 11:30:37 +02:00
Tobias Skarhed
47da3e3ae8 All tests passing 2018-07-27 11:28:16 +02:00
Tobias Skarhed
675a031b6c All except one passing 2018-07-27 11:04:01 +02:00
Sven Klemm
97f24733f5 remove tableschema from query builder ui 2018-07-27 10:58:08 +02:00
Marcus Efraimsson
48e5e65c73 changelog: add notes about closing #12731
[skip ci]
2018-07-27 10:33:06 +02:00
Marcus Efraimsson
13fa3a8378 Merge pull request #12734 from grafana/12731_fix_index_pattern
elasticsearch: fix index patterns
2018-07-27 10:22:02 +02:00
Marcus Efraimsson
ab8fa0de74 elasticsearch: support reversed index patterns
Now both [index-]pattern and pattern[-index] are supported
2018-07-26 21:39:02 +02:00
Marcus Efraimsson
318b8c5a23 update devenv datasources and dashboards for sql datasources
Removed dashboards from docker blocks
2018-07-26 18:12:00 +02:00
Marcus Efraimsson
4f7882cda2 mssql: use new sql engine 2018-07-26 18:11:10 +02:00
Marcus Efraimsson
27db454012 mysql: use new sql engine 2018-07-26 18:10:45 +02:00
Marcus Efraimsson
2f3851b915 postgres: use new sql engine 2018-07-26 18:10:17 +02:00
Marcus Efraimsson
d42cea5d42 refactor sql engine to make it hold all common code for sql datasources 2018-07-26 18:09:42 +02:00
Tobias Skarhed
fc06f8bfe7 Pass more tests 2018-07-26 17:22:15 +02:00
David
7699451d94 Refactor Explore query field (#12643)
* Refactor Explore query field

- extract typeahead field that only contains logic for the typeahead
  mechanics
- renamed QueryField to PromQueryField, a wrapper around TypeaheadField
  that deals with Prometheus-specific concepts
- PromQueryField creates a promql typeahead by providing the handlers
  for producing suggestions, and for applying suggestions
- The `refresher` promise is needed to trigger a render once an async
  action in the wrapper returns.

This is prep work for a composable query field to be used by Explore, as
well as editors in datasource plugins.

* Added typeahead handling tests

- extracted context-to-suggestion logic to make it testable
- kept DOM-dependent parts in main onTypeahead funtion

* simplified error handling in explore query field

* Refactor query suggestions

- use monaco's suggestion types (roughly), see
  https://github.com/Microsoft/monaco-editor/blob/f6fb545/monaco.d.ts#L4208
- suggest functions and metrics in empty field (ctrl+space)
- copy and expand prometheus function docs from prometheus datasource
  (will be migrated back to the datasource in the future)

* Added prop and state types, removed unused cwrp

* Split up suggestion processing for code readability
2018-07-26 15:04:12 +03:00
Tobias Skarhed
88e91b3f51 Begin conversion 2018-07-26 10:44:40 +02:00
David
1db2e869c5 Merge pull request #12718 from grafana/davkal/ts-options
Add tslib to TS compiler
2018-07-26 10:41:14 +02:00
Marcus Efraimsson
751f68ab47 Merge pull request #12723 from dehrax/12224-variable-srv
Karma to Jest: variable_srv_init
2018-07-26 10:32:14 +02:00
Tobias Skarhed
35cc85bfcc All tests passing. Remove Karma test. 2018-07-26 09:36:46 +02:00
Tobias Skarhed
931b944cdd Almost all tests passing 2018-07-25 17:38:45 +02:00
David Kaltschmidt
84e431d377 Add tslib to TS compiler
- using tslib reduces bundle sizes
- add compiler option for easier default imports of CJS modules
- remove double entry of fork-ts-checker-plugin
- speed up hot reload by using exprimental ts-loader API
2018-07-25 17:06:44 +02:00
Marcus Efraimsson
48d9b37559 Merge pull request #12693 from dehrax/docs-prom-queryvars
Docs: Prometheus template query variables
2018-07-25 16:32:08 +02:00
Marcus Efraimsson
0f99e624b6 docs: using interval and range variables in prometheus
Included example usages
2018-07-25 16:20:00 +02:00
Tobias Skarhed
7d51c15240 Two passing tests 2018-07-25 16:15:03 +02:00
Josh Dadak
c4308fedea Update Configuration.md
Perhaps not worded as best it could be, however it would be good to include some information here about the importance of having your Grafana SERVER_ROOT_URL being the same URL listed in your Return URLs in Azure Application.  Otherwise Azure Active Directory Auth will not work correctly resulting in an error page being displayed.
2018-07-25 14:02:36 +01:00
Tobias Skarhed
f350461206 Start conversion 2018-07-25 14:52:03 +02:00
Marcus Efraimsson
7e773e2d5e changelog: add notes about closing #12533
[skip ci]
2018-07-25 14:14:25 +02:00
Marcus Efraimsson
9c40028d58 changelog: add notes about closing #12668
[skip ci]
2018-07-25 13:22:55 +02:00
Marcus Efraimsson
45762d04e3 changelog: update
[skip ci]
2018-07-25 11:55:34 +02:00
Marcus Efraimsson
5fbd8ada3c changelog: add notes about closing #12668
[skip ci]
2018-07-25 11:54:51 +02:00
Marcus Efraimsson
81a041b50c Merge pull request #12672 from grafana/12668-blue-in-light-theme
adjust table header contrast for the light theme
2018-07-25 11:49:45 +02:00
Patrick O'Carroll
df62282c11 fix for typeahead background, increased lighten 2018-07-25 11:27:43 +02:00
Patrick O'Carroll
f4ab432542 added position absolute and some flexbox so I could remov changes in display and setTimeout, added tests and types, did some renaming 2018-07-25 10:29:55 +02:00
Marcus Efraimsson
35920838aa Merge pull request #12709 from mtanda/cw_404_err_fix
fix invalid reference
2018-07-25 09:13:52 +02:00
Mitsuhiro Tanda
055d208a32 fix invalid reference 2018-07-25 11:27:43 +09:00
Marcus Efraimsson
582652145f minor fixes 2018-07-24 19:21:23 +02:00
Marcus Efraimsson
01ba973c86 Merge pull request #12707 from grafana/fix_failing_test
fix failing test due to time diff issues
2018-07-24 19:18:06 +02:00
Marcus Efraimsson
1dd9646a50 fix failing test due to time diff issues 2018-07-24 19:05:09 +02:00
Marcus Efraimsson
27b386c91d Merge pull request #12706 from dehrax/12224-graphite-query-ctrl
Karma to Jest: graphite query_ctrl
2018-07-24 19:02:50 +02:00
Tobias Skarhed
ce9b25a5ac Remove comments 2018-07-24 18:30:29 +02:00
Marcus Efraimsson
d8d748d2aa remove unneeded comment 2018-07-24 17:40:00 +02:00
Marcus Efraimsson
74b4d2efd5 Merge pull request #12704 from dehrax/12224-completer
Karma to Jest: completer
2018-07-24 17:37:43 +02:00
Tobias Skarhed
27c081349f Remove old influx stuff 2018-07-24 17:03:58 +02:00
Marcus Efraimsson
1c4dd6f2f7 Merge pull request #12702 from dehrax/12224-influx-query-ctrl
Karma to Jest: influx query_ctrl
2018-07-24 16:58:01 +02:00
Marcus Efraimsson
04c91601a4 Merge pull request #12699 from grafana/docs-reloading-configs
docs: mentation that config changes requires restart.
2018-07-24 16:47:18 +02:00
Marcus Efraimsson
5de8b6c2f0 changelog: add notes about closing #12489
[skip ci]
2018-07-24 16:45:36 +02:00
Marcus Efraimsson
e921f3b673 Merge pull request #12698 from mtanda/cw_400_err
CloudWatch backend return 400 if user input error
2018-07-24 16:43:22 +02:00
Marcus Efraimsson
a63fca03b8 changelog: add notes about closing #12551
[skip ci]
2018-07-24 15:57:07 +02:00
Marcus Efraimsson
1c691ac855 changelog: add notes about closing #12533
[skip ci]
2018-07-24 15:51:34 +02:00
Tobias Skarhed
b58a7642dc Karma to Jest 2018-07-24 15:41:58 +02:00
Tobias Skarhed
25c8233523 Begin conversion 2018-07-24 15:41:58 +02:00
Marcus Efraimsson
3dab4e1b52 changelog: add notes about closing #12589
[skip ci]
2018-07-24 15:27:13 +02:00
Marcus Efraimsson
b81621b6f5 changelog: add notes about closing #12636 #9827
[skip ci]
2018-07-24 15:24:44 +02:00
Tobias Skarhed
51caf470f5 Remove influx qeury_ctrl jest, as it is already completed 2018-07-24 14:56:14 +02:00
Tobias Skarhed
d6381bed7c Test fail depending on test order 2018-07-24 14:56:13 +02:00
Tobias Skarhed
d2f81d52d4 Karma to Jest: begin influx query_ctrl 2018-07-24 14:56:13 +02:00
Tobias Skarhed
49a8c2e0c1 Make beautiful 2018-07-24 14:56:13 +02:00
Tobias Skarhed
c0f9c06f21 Karma to Jest: completer 2018-07-24 14:56:13 +02:00
Tobias Skarhed
48ae9ec77e Remove comments and Karm test 2018-07-24 14:35:37 +02:00
Tobias Skarhed
987a16086b Karma to Jest 2018-07-24 14:34:37 +02:00
Tobias Skarhed
81c32780b9 Pass more tests 2018-07-24 11:27:53 +02:00
Marcus Efraimsson
35efb7c225 changelog: add notes about closing #12644
[skip ci]
2018-07-24 11:26:09 +02:00
Marcus Efraimsson
05da21c6d7 Merge pull request #12678 from yogyrahmawan/escape_postgres_parameters
postgres; escape ssl mode parameter
2018-07-24 11:15:21 +02:00
Marcus Efraimsson
93e73919e8 fix code style 2018-07-24 11:03:46 +02:00
Leonard Gram
59c1705399 docs: mentation that config changes requires restart. 2018-07-24 10:34:11 +02:00
Mitsuhiro Tanda
d9bf894383 return 400 if user input error 2018-07-24 17:06:55 +09:00
David
4d722b2177 Merge pull request #12675 from grafana/davkal/logging-datasource
Datasource for Grafana logging platform
2018-07-23 18:11:11 +02:00
srid12
6b071054a3 changing callback fn into arrow functions for correct usage of this (#12673) 2018-07-23 07:23:26 -07:00
Marcus Efraimsson
a17a9218da Merge pull request #12692 from dehrax/12224-graph-ctrl
Karma to Jest: graph_ctrl
2018-07-23 15:53:41 +02:00
Tobias Skarhed
47bec0fd91 Fix requested changes 2018-07-23 15:42:47 +02:00
Tobias Skarhed
70575c8f78 Add templating docs for 2018-07-23 15:34:03 +02:00
Tobias Skarhed
816ee82d26 Add docs about global variables in query template variables 2018-07-23 15:25:59 +02:00
David
76bc02b3fa Update CHANGELOG.md
Added #12597
2018-07-23 14:58:11 +02:00
Tobias Skarhed
bb0af52d34 Figuring out why it doesn't initialize 2018-07-23 14:54:58 +02:00
David
b09a7c5dd6 Merge pull request #12597 from dehrax/7664-query-var
Interval and range in query template variable
2018-07-23 14:48:49 +02:00
Tobias Skarhed
6b6a23ff6a Add support for interval in query variable
Add range to scopedVars

Add basic tests and extract function for range vars

Add support for range query variable in createQuery

Template vars squash
2018-07-23 14:33:21 +02:00
Tobias Skarhed
46e31621b0 Add jest file 2018-07-23 14:28:17 +02:00
Tobias Skarhed
529883b61d Change to arrow functions 2018-07-23 13:39:32 +02:00
Tobias Skarhed
ed8568f0df Add graph_ctrl jest 2018-07-23 13:38:16 +02:00
Marcus Efraimsson
0fa98a812b changelog: add notes about closing #12691
[skip ci]
2018-07-23 13:13:18 +02:00
Marcus Efraimsson
c26b9a49ad Merge pull request #12691 from mwegrzynek/add-pln-format
Add Polish złoty to currency formatters
2018-07-23 13:10:12 +02:00
Michał Węgrzynek
ee2eda615e Update kbn.ts 2018-07-23 12:07:54 +02:00
Marcus Efraimsson
d7401a9f8a Merge pull request #12690 from mtanda/cw_get_metricdata_input_validation
Id validation of CloudWatch GetMetricData
2018-07-23 11:48:01 +02:00
Tobias Skarhed
ae935bf08b Add jest test file 2018-07-23 11:31:04 +02:00
Marcus Efraimsson
dde484be60 Merge pull request #11469 from grafana/jquery-flot-events-to-ts
migrated jquery.flot.events to ts
2018-07-23 11:20:50 +02:00
Marcus Efraimsson
608303f4ce Merge branch 'master' into jquery-flot-events-to-ts 2018-07-23 10:59:25 +02:00
Mitsuhiro Tanda
fb4546b811 Id validation of CloudWatch GetMetricData 2018-07-23 17:58:54 +09:00
Kim Christensen
8c52e2cd57 Fix timezone issues in test 2018-07-23 10:05:46 +02:00
Sven Klemm
b3ebc86093 fix window function query without group by 2018-07-23 07:52:42 +02:00
Daniel Lee
34a8864601 changelog: adds note for #11487 2018-07-22 21:52:26 +02:00
Daniel Lee
5129ea8f87 Merge pull request #11624 from mtanda/cw_get_metric_data
CloudWatch GetMetricData support
2018-07-22 21:34:07 +02:00
Sven Klemm
e1a37cf275 add order by to metadata queries 2018-07-22 17:12:30 +02:00
Sven Klemm
7af9cd7dfc set explicit order for rate and increase 2018-07-22 15:20:40 +02:00
yogyrahmawan
26aa575cb4 escaping ssl mode on postgres param 2018-07-22 08:04:57 +07:00
Sven Klemm
84d7743939 fix pre gui queries shortcircuit 2018-07-21 10:38:34 +02:00
Kim Christensen
dd81f4381d Add unit test for InfluxDB datasource 2018-07-21 02:13:41 +02:00
Kim Christensen
a2574ac068 Support timeFilter in templating for InfluxDB
After support for queries in template variables was added to InfluxDB,
it can be necessary to added dymanic time constraints. This can now be
done changing the variable refresh to "On Time Range Changed" for
InfluxDB
2018-07-21 00:45:02 +02:00
David Kaltschmidt
3297ae462d Datasource for Grafana logging platform
- new builtin datasource plugin "Logging" (likely going to be renamed)
- plugin implements no panel ctrls yet, only ships datasource
- new models for logging data as first class citizen (aside from table
  and time_series model)
- Logs as new view for Explore
- JSON view for development

Testable only against existing logish deployment.
Then test with queries like `{job="..."} regexp`.
2018-07-20 17:07:17 +02:00
Patrick O'Carroll
b6909eb3b0 removed blue-dark variable with blue-light in light-theme, blue variable now has same value as blue-dark had before, should fix issue with any low contrast issues with blue in light-theme, this made query-blue variable unnecessery removed it, added variable for variable dropdown highlight background 2018-07-20 16:02:41 +02:00
Patrick O'Carroll
b8a4b7771a removed import appEvents 2018-07-20 11:09:24 +02:00
Patrick O'Carroll
0b421004ea built a component for delete button in tables, instead of using a modal to confirm it now does it in the row of the table, created a sass file for the component, the component uses css transitions for animation 2018-07-20 09:59:04 +02:00
David
bfd05ba6ec Merge pull request #12617 from grafana/davkal/prometheus-value-formatting
Make prometheus value formatting more robust
2018-07-18 17:11:16 +02:00
Torkel Ödegaard
e413f026b9 fix: postgres/mysql engine cache was not being used, fixes #12636 (#12642) 2018-07-18 07:21:32 -07:00
Torkel Ödegaard
ce64a3ccbc added: replaces added to grafana 2018-07-18 15:40:30 +02:00
Torkel Ödegaard
a4587cdeee fix: datasource search was not working properly 2018-07-18 14:28:38 +02:00
Sven Klemm
9f0b4e0aa7 add groupby when adding first aggregate 2018-07-18 13:29:47 +02:00
Torkel Ödegaard
29291f88b1 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:20:56 +02:00
Torkel Ödegaard
913b8576f8 docs: minor docs fix 2018-07-18 13:20:28 +02:00
David Kaltschmidt
3ab5ab3674 Fix label suggestions in Explore query field
- In 0425b477 the labels suggestions were refactored and a typo broke
  the look up for available lables of a metric
2018-07-18 13:20:18 +02:00
Torkel Ödegaard
3fa2ec0762 Merge branch 'ldap-grafana-admin' 2018-07-18 13:02:49 +02:00
Torkel Ödegaard
c63f142578 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:02:27 +02:00
Torkel Ödegaard
660dc09fa9 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 12:46:42 +02:00
Daniel Lee
3cb95fb40a pluginloader: expose flot gauge plugin 2018-07-18 12:05:45 +02:00
Daniel Lee
f5cc7618c5 alert: add missing test after refactor 2018-07-17 22:17:43 +02:00
Jakob van Santen
92d417f6b4 Handle query string in storage public_url (#9351) (#12555) 2018-07-17 11:10:12 -07:00
David
21e5d61de6 Merge pull request #12631 from grafana/davkal/explore-url-encoding
Use url params for explore state
2018-07-17 16:49:13 +02:00
David
5c6adbbada Merge pull request #12630 from grafana/davkal/explore-empty-error
Dont parse empty explore state from url
2018-07-17 16:48:23 +02:00
Augustin
05e060dee0 HTTP API documentation +fix when updating a playlist (#12612)
* get id from path param when updating a playlist

* add playlist http api documentation

* remove required condition for the id in update cmd
2018-07-17 07:45:38 -07:00
David
b526150578 Merge pull request #12634 from grafana/davkal/explore-step
Explore: calculate query interval based on available width
2018-07-17 16:36:51 +02:00
David Kaltschmidt
02427ef88d Explore: calculate query interval based on available width
- classic dashboard panels inject a dynamic query interval as part of
  the query options. Explore did not have that.
- this PR adds the interval calculation to Explore
- interval based on Explore container's width
- ensure min interval if set in datasource
2018-07-17 15:13:44 +02:00
David Kaltschmidt
c6e9ffb168 Use url params for explore state
- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
2018-07-17 12:56:05 +02:00
David Kaltschmidt
f67b27e009 Dont parse empty explore state from url
- only parse url state if there is any
- prevents parse exception in the console on empty explore state
2018-07-17 12:24:04 +02:00
Torkel Ödegaard
e318489bd4 Fix default browser th font-weight 2018-07-17 11:56:33 +02:00
Daniel Lee
8ff055b1d5 Merge pull request #12624 from calebtote/patch-1
Adding eval_data to alerts query results
2018-07-17 10:23:08 +02:00
Caleb Tote
10aaf7b506 Adding eval_data to alerts query results 2018-07-16 12:38:42 -04:00
Torkel Ödegaard
c189262bac ldap: Make it possible to define Grafana admins via ldap setup, closes #2469 2018-07-16 16:56:42 +02:00
Daniel Lee
a1f0dffe01 nginx: update to docker block
Adds commented out settings in nginx conf
for testing basic auth and auth proxy
2018-07-16 15:09:42 +02:00
Torkel Ödegaard
f0508aa526 Merge branch 'master' of github.com:grafana/grafana 2018-07-16 13:52:34 +02:00
David Kaltschmidt
1f74b298c4 Remove string casting for template variables in prometheus 2018-07-16 13:02:36 +02:00
Daniel Lee
0b210a6f5d ldap: docker block readme update 2018-07-16 12:47:22 +02:00
David Kaltschmidt
1efe34e6cf Make prometheus value formatting more robust
- prometheus datasources passes its own interpolator function to the
  template server
- that function relies on incoming values being strings
- some template variables may be non-strings, e.g., `__interval_ms`,
  which throws an error

This PR makes this more robust.
2018-07-16 12:40:55 +02:00
Torkel Ödegaard
09c3569caa Update README.md 2018-07-16 12:36:35 +02:00
Torkel Ödegaard
c6bcf13d78 Devenv testdata dashboards (#12615)
* devenv: working on dev env setup & dashboards

* devenv: refactored testdata app to a built in datasource instead, and moved dashboards to a devenv provisioned dashboards
2018-07-16 03:12:13 -07:00
David
a13b4f2b3f Merge pull request #12596 from grafana/davkal/explore-datasource-selector
Explore Datasource selector
2018-07-16 11:13:29 +02:00
Torkel Ödegaard
2dd60f78d9 devenv: working on dev env setup & dashboards 2018-07-16 10:53:41 +02:00
Sven Klemm
0e608a08c2 fix test for query generation 2018-07-15 22:58:25 +02:00
Sven Klemm
7f348f3836 dont run queries if target has no table set 2018-07-15 22:27:33 +02:00
Sven Klemm
43686616a0 add query to find metric table 2018-07-15 22:26:32 +02:00
Sven Klemm
b49d10104e add popover for metric column 2018-07-15 19:13:19 +02:00
Sven Klemm
b28bf1a4f9 rename PostgresQueryBuilder to PostgresMetaQuery 2018-07-15 17:12:03 +02:00
Sven Klemm
070b556fd3 dont expand variables in rawSql 2018-07-15 17:02:26 +02:00
Sven Klemm
2fcb09b23d filter datatype for groupby suggestions 2018-07-15 16:23:47 +02:00
Sven Klemm
6e824e81bf fix rate special function when using group by 2018-07-15 15:14:12 +02:00
Sven Klemm
c3c20ef2e2 remove unused import 2018-07-15 12:52:00 +02:00
Sven Klemm
f85c9c012e refactor adding sqlPart 2018-07-15 12:26:22 +02:00
Sven Klemm
f48060a1bb remove render code from sql_part 2018-07-15 09:53:22 +02:00
Sven Klemm
d9648f1fe7 fix bug in query generation with metricColumn 2018-07-15 09:43:38 +02:00
Sven Klemm
fa66645b0f refactor PostgresQuery 2018-07-15 09:36:49 +02:00
Sven Klemm
844beb660d refactor PostgresQueryCtrl 2018-07-14 21:00:06 +02:00
Sven Klemm
d7ed706e12 refactor PostgresQueryCtrl and PostgresQuery 2018-07-14 20:28:34 +02:00
Sven Klemm
2dc9d4e960 refactor addGroupBy and removeGroupByPart 2018-07-14 16:46:53 +02:00
Sven Klemm
569a8567f9 use let for variable declaration 2018-07-14 11:32:00 +02:00
Sven Klemm
d0c2b19c51 Add templateSrv to PostgresQuery tests 2018-07-14 11:05:35 +02:00
Sven Klemm
b745fab190 add tests for query generation 2018-07-13 22:29:10 +02:00
David Kaltschmidt
eb2abe800b Reverted $q to Promise migration in datasource_srv 2018-07-13 22:28:14 +02:00
Mark Meyer
0f6e5e2953 Allow settting of default org id to auto-assign to (#12401)
Author:    Mark Meyer <mark@ofosos.org>
2018-07-13 12:14:40 -07:00
Tobias Skarhed
7ae844518c Remove unused SASS variables (#12603)
* Comment out unused vars

* Remove unused sass vars
2018-07-13 12:10:09 -07:00
Torkel Ödegaard
964620c38c fix: panel embedd scrolbar fix, fixes #12589 (#12595) 2018-07-13 05:07:04 -07:00
Sven Klemm
17591ca29f fix tests for postgres datasource 2018-07-13 10:15:55 +02:00
David Kaltschmidt
390090da05 Set datasource in deep links to Explore 2018-07-13 09:45:56 +02:00
Sven Klemm
693efda4d5 send timerange with metricFindQuery 2018-07-13 09:31:39 +02:00
David Kaltschmidt
d06b26de26 Explore Datasource selector
Adds a datasource selector to the Explore UI. Only datasource plugins
that have `explore: true` in their `plugin.json` can be selected.

- adds datasource selector (based on react-select) to explore UI
- adds getExploreSources to datasource service
- new `explore` flag in datasource plugins model
- Prometheus plugin enabled explore
2018-07-13 09:09:36 +02:00
Shane
756c08e713 changed you to your (#12590) 2018-07-12 23:56:37 -07:00
Sven Klemm
bf21f1bf76 indent generated SQL 2018-07-12 22:36:41 +02:00
David
64c77febef Merge pull request #12586 from dehrax/12075-iframe-scroll
Prevent scroll on focus for iframe
2018-07-12 16:10:06 +02:00
Tobias Skarhed
7361d352bf Add comments 2018-07-12 15:38:41 +02:00
David
030d06331f Merge pull request #12585 from grafana/davkal/fix-plugin-css-loader-2
Fix freezing browser when loading plugin
2018-07-12 14:51:45 +02:00
David Kaltschmidt
81e62e1051 Fix freezing browser when loading plugin
- broken since 4d2dd2209
- `*` was previously working as a path matcher, but freezes browser when
  used with new cache-busting plugin loader
- changed matcher to be `/*`
2018-07-12 13:16:41 +02:00
Sven Klemm
a24a6624e3 handle counter overflow and resets in rate 2018-07-12 13:15:19 +02:00
Sven Klemm
0935526d23 partition by metricColumn when using increase 2018-07-12 10:13:21 +02:00
Sven Klemm
bbe7b9b908 add rate and increase special functions 2018-07-12 09:57:04 +02:00
Mitsuhiro Tanda
9b50c9038b skip backend request if extended statistics is invalid. (#12495)
* check extended statistics pattern

* check extended statistics pattern

* Revert "check extended statistics pattern"

This reverts commit 52c7b1a972636d5f5729e64ae5e00e6fae329257.

* add test

* fix test
2018-07-11 11:23:38 -07:00
Torkel Ödegaard
c03764ff8a Refactor team pages to react & design change (#12574)
* Rewriting team pages in react

* teams to react progress

* teams: getting team by id returns same DTO as search, needed for AvatarUrl

* teams: progress on new team pages

* fix: team test

* listing team members and removing team members now works

* teams: team member page now works

* ux: fixed adding team member issue

* refactoring TeamPicker to conform to react coding styles better

* teams: very close to being done with team page rewrite

* minor style tweak

* ux: polish to team pages

* feature: team pages in react & everything working

* fix: removed flickering when changing tabs by always rendering PageHeader
2018-07-11 11:23:07 -07:00
Mitsuhiro Tanda
18a8290c65 (prometheus) prevent error to use $__interval_ms in query (#12533)
* prevent error to use $__interval_ms in query

* add test

* prevent error to use $__interval_ms in query
2018-07-11 11:13:47 -07:00
Torkel Ödegaard
b4e0ace7a2 fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554) 2018-07-11 10:58:06 -07:00
Łukasz Gryglicki
24f395f986 Add support for skipping variable value in URL, fixes #12174 (#12541)
* New rebase

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>

* Lint

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>
2018-07-11 10:06:36 -07:00
Torkel Ödegaard
2c22a7b4ba Don't build-all for PRs 2018-07-11 13:31:34 +02:00
Sven Klemm
2784a2df6b Refactor value column SQL generation 2018-07-11 13:03:06 +02:00
Sven Klemm
9ba42f63f1 Refactor metric column sql generation 2018-07-11 12:33:37 +02:00
Rollulus Rouloul
2fbf2bba4e fix: requests/sec instead of requets (#12557) 2018-07-11 03:33:19 -07:00
Tobias Skarhed
cfa555b569 Add folder name to dashboard title (#12545)
* Add folder name to dashboard title. No display on medium displays and below

* Compare folderId instead

* folderId bigger than 0
2018-07-11 03:31:07 -07:00
David
4d2dd22095 Fix css loading in plugins (#12573)
- allow css loader to be imported again (wasnt prefixed by plugin)
2018-07-11 03:29:19 -07:00
Sven Klemm
a86e77fc68 Refactor group by query generation 2018-07-11 12:20:24 +02:00
Sven Klemm
b9edc3c611 Refactor where clause generation 2018-07-11 11:50:02 +02:00
Sven Klemm
5dd236bf05 refactor SQL generation for value columns 2018-07-11 11:09:28 +02:00
Sven Klemm
772825ed09 Refactor time column sql generation 2018-07-11 11:00:12 +02:00
Sven Klemm
c5bde0ef45 Refactor render function on PostgresQuery 2018-07-11 10:50:49 +02:00
Sven Klemm
1d711924bc Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-11 10:21:13 +02:00
Sven Klemm
c8a11d597f prepare sql part for special functions 2018-07-10 21:43:57 +02:00
Sven Klemm
0e610cad1b set query gui as default handle old panels gracefully 2018-07-10 21:40:59 +02:00
Bryan T. Richardson
daf0c374b3 Added BurstBalance metric to list of AWS RDS metrics. 2018-07-10 10:11:39 -06:00
Sven Klemm
9d5b4cb91d dont throw exception for unknown types 2018-07-10 14:45:36 +02:00
Tobias Skarhed
4ee4ca99be Prevent scroll on focus for iframe 2018-07-10 12:54:45 +02:00
Sven Klemm
e8e24f6139 add alias when adding group by 2018-07-10 11:32:23 +02:00
Dominic Smith
5578097210 Add new sequential color scales
* Add new sequential color scales

* Simplify inversion logic
2018-07-10 12:17:55 +03:00
Sven Klemm
6e7161f238 add aggregates when adding group by 2018-07-10 11:14:00 +02:00
David
9595f992b9 Merge pull request #12496 from dehrax/12224-prostgres-ds
Karma to Jest: 3 data sources
2018-07-10 11:13:44 +02:00
Sven Klemm
483e7c0163 remove superfluous braces 2018-07-10 10:21:02 +02:00
Sven Klemm
dc93055a10 add column alias when add aggregate function 2018-07-10 10:19:30 +02:00
yogy rahmawan
8b32dc5847 move go vet out of scripts and fixing warning (#12552) 2018-07-09 23:25:32 -07:00
Sven Klemm
5a307e80aa fix enter in sql_part_editor 2018-07-09 22:43:50 +02:00
Sven Klemm
bfc751542c fix editing expression parts 2018-07-09 22:38:29 +02:00
Sven Klemm
f140967423 rename inputBlur to switchToLink 2018-07-09 22:00:50 +02:00
Tobias Skarhed
e51f208a49 Cleanup and remove some jest.fn() 2018-07-09 15:42:34 +02:00
Sven Klemm
02abda7d92 fix spelling 2018-07-09 14:47:59 +02:00
Sven Klemm
2d951ba611 add current value to dropdown if its not in resultset 2018-07-09 14:27:10 +02:00
Sven Klemm
6a981d39d8 Revert "show current value in dropdown when its not part of list"
This reverts commit 76275cae37.
2018-07-09 13:04:55 +02:00
Tobias Skarhed
6670acd082 Remove irrelevant tests and templateSrv stub 2018-07-09 12:52:56 +02:00
David
25bcdbcab1 Merge pull request #12284 from grafana/davkal/queryfield-refactor
Query field refactorings to support external plugins
2018-07-09 11:29:59 +02:00
Sven Klemm
76275cae37 show current value in dropdown when its not part of list 2018-07-09 11:22:03 +02:00
Torkel Ödegaard
d85fa66fb4 redid redux poc, old branch was to old and caused to many conflicts 2018-07-09 10:28:20 +02:00
Torkel Ödegaard
3740d56491 wip: redux poc 2018-07-09 09:17:38 +02:00
Torkel Ödegaard
5a925461f1 Update CHANGELOG.md 2018-07-09 07:00:11 +02:00
Jesse Tane
677117fb03 fix diff and percent_diff (#12515)
* make diff and percent_diff tests more realistic

* fix diff and percent_diff

* include @marefr's additional tests
2018-07-08 21:58:34 -07:00
Mitsuhiro Tanda
77220456b6 improve error message 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
4c59be4f5b generate unique id when variable is multi 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
40ed235b3b support GetMetricData 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
077cf9a343 dep ensure 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
664944980a update aws-sdk-go 2018-07-09 13:11:49 +09:00
Ryan McKinley
f53e166114 Update lodash/moment version (#12532)
* tabs to spaces

testing commit permisions :)

* revert

* Update lodash and moment
2018-07-08 13:06:08 -07:00
Ryan McKinley
dca22fd151 Tabs to spaces in tslint (#12529)
* tabs to spaces

testing commit permisions :)

* revert

* tabs to spaces
2018-07-08 07:48:05 -07:00
Sven Klemm
09c06ced14 formatting 2018-07-07 21:22:12 +02:00
Sven Klemm
5b5dcabd22 add None to metric column suggestions 2018-07-07 21:21:11 +02:00
Sven Klemm
3f4c808cc5 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-07 20:54:33 +02:00
Sven Klemm
8490ae41b6 handle pre query gui queries gracefully 2018-07-07 20:41:24 +02:00
Sven Klemm
eb170e741b dont break on panels that dont have rawQuery set 2018-07-07 19:59:25 +02:00
Sven Klemm
b2b4860bdb refactor transformToSegments 2018-07-07 19:43:21 +02:00
Torkel Ödegaard
b464a28cca devenv: updated devenv provision scripts 2018-07-07 14:40:17 +02:00
Torkel Ödegaard
645974ec8d ux: minor fix/tweak to inactive view mode, think logo should be visible & fixes dashboard title alignment 2018-07-07 10:25:41 +02:00
Marcus Efraimsson
922371ba76 changelog: add notes about closing #12379
[skip ci]
2018-07-06 17:48:39 +02:00
Marcus Efraimsson
319488676f Merge pull request #12521 from grafana/davkal/fix-datasource-sort
Fix datasource sorting with template variables
2018-07-06 16:18:02 +02:00
David Kaltschmidt
7ddcaf22d5 Fix datasource sorting with template variables
- fixes sorting when template variables are present
- simplified existing test cases
- added test to cover variable usage in datasource service
2018-07-06 15:32:08 +02:00
Marcus Efraimsson
f2980bb978 changelog: add notes about closing #12484
[skip ci]
2018-07-06 12:55:12 +02:00
Marcus Efraimsson
cbdf6ef355 changelog: add notes about closing #12506
[skip ci]
2018-07-06 12:53:10 +02:00
Marcus Efraimsson
1db067f2ad Merge pull request #12511 from alexanderzobnin/fix-12484
Prometheus heatmap: fix unhandled error when some points are missing
2018-07-06 12:50:04 +02:00
Sven Klemm
e4b4b3a772 rename quoteLiteral to quoteIdentAsLiteral 2018-07-06 12:38:43 +02:00
Marcus Efraimsson
af434df5a3 changelog: add notes about closing #12506
[skip ci]
2018-07-06 12:35:19 +02:00
Marcus Efraimsson
926892749f Merge pull request #12518 from grafana/12506_dash_links
Fix links not updating after changing variables
2018-07-06 12:33:19 +02:00
Marcus Efraimsson
5e4d6958d6 fix links not updating after changing variables 2018-07-06 11:54:37 +02:00
Sven Klemm
a63298bca2 remove unused function removeSelect 2018-07-06 11:25:20 +02:00
Sven Klemm
d9db3d1402 put updateParam back in 2018-07-06 11:24:49 +02:00
Sven Klemm
6143924ec6 fix where clause generation 2018-07-06 10:56:47 +02:00
Sven Klemm
7600c6efcb remove hardcoded $__timeFilter, make macros functional in where clause 2018-07-06 10:38:52 +02:00
Sven Klemm
8ed210c8d5 remove dead code, make label more flexible 2018-07-06 10:38:18 +02:00
Sven Klemm
85ab1cfa8f fix constraint removal 2018-07-06 09:28:34 +02:00
Sven Klemm
d8c7756489 dont autoquote, suggest quoted values if requried 2018-07-05 21:36:39 +02:00
Alexander Zobnin
36f08994cc prometheus heatmap: fix unhandled error when some points are missing 2018-07-05 16:33:52 +03:00
Marcus Efraimsson
50a522d418 fix caret for help button is ds http settings 2018-07-05 13:01:10 +02:00
Sven Klemm
3f614e635b do not autoquote identifiers 2018-07-05 11:27:19 +02:00
Sven Klemm
c604651092 fix group by ui 2018-07-05 10:19:22 +02:00
Marcus Efraimsson
240cf63ba6 changelog: add notes about closing #11618 #11619 2018-07-04 20:07:43 +02:00
Marcus Efraimsson
d90d4ce55d Merge pull request #12402 from AustinWinstanley/macros/sql
mysql,mssql: improve $__timeFilter, $__timeFrom, $__timeTo macros

The $__timeFilter macro now uses a BETWEEN with timestamps instead of 
comparing epochs
The $__timeFrom and $__timeTo macros now return strings of format 
YYYY-MM-DDThh:mm:ssZ instead of epoch
2018-07-04 20:01:43 +02:00
Sven Klemm
aacf555985 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 18:59:23 +02:00
Sven Klemm
3595436614 fix where constraint handling 2018-07-04 18:57:55 +02:00
Sven Klemm
7d30ca04de remove dead code from sql_part
fix where clause query generation
2018-07-04 15:37:06 +02:00
Sven Klemm
3b632510fb code formatting 2018-07-04 15:20:52 +02:00
Tobias Skarhed
74bf80962d Add mock to test files 2018-07-04 14:32:22 +02:00
Tobias Skarhed
962340bcd1 Create new instance in beforeEach 2018-07-04 14:32:22 +02:00
Tobias Skarhed
a37a0c7be3 Remove comments 2018-07-04 14:32:22 +02:00
Tobias Skarhed
42ba0dc73f Karma to Jest: Cloudwatch datasource 2018-07-04 14:32:22 +02:00
Tobias Skarhed
d4bd52139a Karma to Jest: MySQL datasource 2018-07-04 14:30:36 +02:00
Tobias Skarhed
3bbe39c5ad Karma to Jest: postgres datasource 2018-07-04 14:30:36 +02:00
Marcus Efraimsson
ea9964cfa1 Merge pull request #12493 from dehrax/12224-datasource-elastic
Karma to Jest: elasticsearch datasource
2018-07-04 14:03:25 +02:00
Marcus Efraimsson
e8ee1be5e4 Merge pull request #12502 from Nexucis/feature/api-doc-improve
Fix HTTP-API admin doc
2018-07-04 13:52:13 +02:00
Tobias Skarhed
d3c213973c Basic cleanup 2018-07-04 13:13:06 +02:00
Tobias Skarhed
12d158f391 Add mocks in test file 2018-07-04 13:13:06 +02:00
Tobias Skarhed
8f1bcd9117 Remove q and stub 2018-07-04 13:13:06 +02:00
Tobias Skarhed
80b2f5c756 Add Jest stubs 2018-07-04 13:13:06 +02:00
Tobias Skarhed
69c85e0d7e Remove async 2018-07-04 13:13:06 +02:00
Tobias Skarhed
12e76ad197 Remove logs and comments 2018-07-04 13:13:06 +02:00
Tobias Skarhed
bd417bedb2 Start elastic ds test conversion 2018-07-04 13:13:06 +02:00
Marcus Efraimsson
a8970a4de9 run enterprise build only on master for now 2018-07-04 13:09:42 +02:00
Augustin Husson
86a574cc50 refix the settings indentation 2018-07-04 12:30:23 +02:00
Augustin Husson
991a4b1663 update stats admin doc 2018-07-04 12:26:30 +02:00
Augustin Husson
01fc6c5d95 fix json indentation 2018-07-04 12:23:10 +02:00
Sven Klemm
fee36b2b35 include where constraints in query generation 2018-07-04 12:22:45 +02:00
Marcus Efraimsson
d2f31a716f remove unnecessary conversions 2018-07-04 12:16:39 +02:00
Sven Klemm
ced0a5828f rearrange elements of query builder 2018-07-04 11:56:26 +02:00
Sven Klemm
9847c2186f mv query_part to sql_part 2018-07-04 11:39:58 +02:00
Sven Klemm
19dcc1f41a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 10:12:27 +02:00
Marcus Efraimsson
723a894fc5 changelog: update
[skip ci]
2018-07-03 19:59:34 +02:00
Marcus Efraimsson
634c77469d changelog: add notes about closing #11818
[skip ci]
2018-07-03 19:58:19 +02:00
Marcus Efraimsson
faf2ab4249 changelog: add notes about closing #12460
[skip ci]
2018-07-03 19:54:09 +02:00
Marcus Efraimsson
512e7f8567 changelog: add notes about closing #8186
[skip ci]
2018-07-03 19:50:21 +02:00
Marcus Efraimsson
60792d57dd changelog: add notes about closing #12379
[skip ci]
2018-07-03 19:44:21 +02:00
Marcus Efraimsson
27aa1cd568 changelog: add notes about closing #12362
[skip ci]
2018-07-03 19:41:34 +02:00
Torkel Ödegaard
1f97df46c1 devenv: open ldap docker block now prepopulating data with correct member groups 2018-07-03 12:58:17 +02:00
Leonard Gram
1586a42a71 ci: Only publish grafana enterprise packages tagged with enterprise. 2018-07-03 09:25:51 +02:00
Martin Packman
6046c8b4ca Make table sorting stable when null values exist (#12362)
Currently if a null appears in a table column, for instance in data
returned by postgres, sorting on that gives an arbitrary order. This
is due to null being neither greater or less than any string, which
makes the sort unstable.

Change the table sort function to compare on nullness first. Note
this is a slight behaviour change for numbers, which would otherwise
treat null and 0 as equivalent.

Signed-off-by: Martin Packman <gzlist@googlemail.com>
2018-07-02 11:14:41 -07:00
David
0d1f7c8782 Fix bar width issue in aligned prometheus queries (#12483)
* Fix bar width issue in aligned prometheus queries

This was broken because null values were filled in with unaligned times.

* use aligned times for result transformation
* add tests

An earlier version of this fix aligned the times again in the transformer, but
I think it's safe to only deal with aligned times in the response.

* Fixed prometheus heatmap tranformer test

The interval needs to be 1 to prevent step alignment.
2018-07-02 11:04:36 -07:00
zicklam
a89351e8e0 correct example (#12481)
foo.bar.com in description, but foo.bar in configuration.
Updated description, makes more sense then changing the configuration :)
2018-07-02 09:01:42 -07:00
Torkel Ödegaard
37efa934f1 ldap: improved ldap test env with more structured users and groups 2018-07-02 17:27:16 +02:00
Leonard Gram
5e08bf5130 test: fixed usage of wrap in tests. 2018-07-02 17:13:59 +02:00
Leonard Gram
4245f0ce11 ci: typo 2018-07-02 16:10:20 +02:00
Leonard Gram
8d6797c367 ci: publishes grafana enterprise to s3. 2018-07-02 16:05:23 +02:00
Torkel Ödegaard
6286c31d4b refactoring: making api wrap public 2018-07-02 14:13:18 +02:00
Torkel Ödegaard
b8724ae0c4 refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Tobias Skarhed
2941dff428 Karma to Jest: datasource_srv (#12456)
* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* alerting: only log when screenshot been uploaded

* Remove comments

* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* Remove comments

* Remove console.log

* Remove console.log

* Change sorting and add test for default data source
2018-07-02 04:18:23 -07:00
Torkel Ödegaard
10e86eda69 fix: #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated (#12474) 2018-07-01 23:35:50 -07:00
Mitsuhiro Tanda
aa1b5959da omit extra template refresh (#12454) 2018-07-01 22:56:24 -07:00
Carl Bergquist
861af4cb97 Improve extensions build. (#12461)
* enable ee build on pr/master

* step1: of including group sync

* disable commit pinning for now

* fixes broken build

* enable team to ldap group sync

* avoid returning error for missing external handler

* services: allow routes to be added before http server start

* services: allows services to add their own migrations

* moves db migrations to ee code base

* build using master branch in ee

* disable enterprise build in .bra.toml

[skip ci]

* removes team sync extensions

* removes commented line
2018-07-01 07:01:43 -07:00
Sven Klemm
1601f6d17c [mysql] fix $__timeGroup rounding (#12469)
* fix $__timeGroup rounding for mysql

* revert accidentally commented out line
2018-07-01 06:59:05 -07:00
Sven Klemm
f017c04a65 [mssql] fix $__timeGroup rounding (#12470)
* fix $__timeGroup rounding for mssql

* revert enabling of mssql integration tests
2018-07-01 06:57:02 -07:00
Sven Klemm
c2c22c142b [postgres] fix timeGroup macro rounding (#12468)
* fix timeGroup tests to check for correct grouping

* do explicit floor rounding in $__timeGroup macro

* fix typo in comments
2018-07-01 06:55:46 -07:00
Will Weber
c03d527d25 pkg/social/github: Allow changing of userinfo data (#12471)
Experienced a problem where a user whose email changed was no longer
able to login. By using the ID as a primary identifier, we can avoid
conflicts of this variety within the github OAuth provider.
2018-07-01 05:56:16 -07:00
bergquist
66c56e7bbe notifications: dont return error if one notifer failed 2018-06-30 23:14:18 +02:00
Sven Klemm
410449b5e7 use sqlPart for ui parts 2018-06-30 11:11:34 +02:00
Sven Klemm
d26cacccd9 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-30 10:49:17 +02:00
Carl Bergquist
88783d6e0a avoid calling os.Exit outside main.go (#12459)
I don't think we should call os.Exit outside main.go. Calling
os.Exit breaks the application control flow.
2018-06-29 22:48:26 -07:00
Marcus Efraimsson
845724e8b9 update mysql/mssql query/annotation help sections 2018-06-29 20:39:06 +02:00
Marcus Efraimsson
7a4858dd11 docs: update folders api 2018-06-29 20:24:02 +02:00
Austin Winstanley
59675dc564 Changed documentation for MSSQL and MySQL to reflect macro changes 2018-06-29 13:07:48 -05:00
Marcus Efraimsson
2835acf48c docs: update scripted dashboard for v5 2018-06-29 19:36:15 +02:00
Marcus Efraimsson
4530925b9f docs: update scripted dashboard for v5 2018-06-29 19:30:29 +02:00
Marcus Efraimsson
cdaeb1578d docs: update organisation http api
make the distinction clearer between /api/org and /api/orgs and that
basic auth must be used for the /api/orgs resource
2018-06-29 19:10:42 +02:00
Marcus Efraimsson
aae3b568f3 docs: upd windows installation 2018-06-29 18:21:56 +02:00
bergquist
e91e3ea771 notifications: send notifications synchronous 2018-06-29 16:16:09 +02:00
bergquist
d31c7bc6a4 Merge branch 'master' into alerting_reminder
* master: (95 commits)
  registry: adds more comments
  registry: adds comments to interfaces
  changelog: update
  changelog: update
  changelog: add notes about closing #12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing #12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for #11892
  changelog: add notes about closing #12430
  fix footer css issue
  Karma to Jest: 3 test files (#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
  Karma to Jest: value_select_dropdown (#12435)
  support passing api token in Basic auth password (#12416)
  Add disabled styles for checked checkbox (#12422)
  changelog: add notes about closing #11920
  changelog: add notes about closing #11920
  changelog: update
  ...
2018-06-29 15:44:20 +02:00
bergquist
396f8e6464 notifications: read without tran, write with tran 2018-06-29 15:15:31 +02:00
bergquist
d440b9a8d1 registry: adds more comments 2018-06-29 11:58:54 +02:00
bergquist
f0f6d0e915 registry: adds comments to interfaces 2018-06-29 11:45:32 +02:00
Marcus Efraimsson
cb706bd059 changelog: update
[skip ci]
2018-06-29 10:52:42 +02:00
Marcus Efraimsson
32793350b8 changelog: update
[skip ci]
2018-06-29 10:49:36 +02:00
Marcus Efraimsson
0dd0b65900 changelog: add notes about closing #12438
[skip ci]
2018-06-29 10:48:50 +02:00
Marcus Efraimsson
59756863df Merge pull request #12439 from grafana/fix-log-close-too-early
Fix: Log close (ie flush) was done too early, before final shutdown log
2018-06-29 10:45:14 +02:00
bergquist
c4292b43f5 alerting: only log when screenshot been uploaded 2018-06-29 09:58:58 +02:00
bergquist
ce88e4b927 fixes typos
closes #12453
2018-06-29 09:35:31 +02:00
Austin Winstanley
9823da1cc5 Reverted yarn.lock to master 2018-06-29 03:54:43 +00:00
Austin Winstanley
afee29be68 Merge branch 'master' into macros/sql 2018-06-29 03:51:05 +00:00
Austin Winstanley
a0e8437f8f Used PostgreSQL TSDB as a model the set up the __timeFilter, __timeFrom, and __timeTo macros for Microsoft SQL and MySQL 2018-06-29 03:48:14 +00:00
Austin Winstanley
84af033281 Merge branch 'master' of https://github.com/grafana/grafana 2018-06-29 03:32:18 +00:00
Austin Winstanley
d663122244 Merge branch 'master' of https://github.com/grafana/grafana into macros/sql 2018-06-29 03:31:23 +00:00
Marcus Efraimsson
fb2b2c9f65 changelog: add notes about closing #12444
[skip ci]
2018-06-28 16:39:38 +02:00
Marcus Efraimsson
d226383c4e Merge pull request #12444 from grafana/revert-12299-10707_whitelist
Revert "auth proxy: use real ip when validating white listed ip's"
2018-06-28 16:31:26 +02:00
Marcus Efraimsson
8af5da7383 Revert "auth proxy: use real ip when validating white listed ip's" 2018-06-28 15:43:33 +02:00
Daniel Lee
7a2be69abc changelog: adds note for #11892 2018-06-28 14:46:40 +02:00
Daniel Lee
8537f10285 Merge pull request #11892 from ApsOps/colorize-singlestat-prefix-postfix-option
Make colorization of prefix and postfix optional in singlestat
2018-06-28 14:42:48 +02:00
Marcus Efraimsson
4c4bd2ebba changelog: add notes about closing #12430
[skip ci]
2018-06-28 14:27:41 +02:00
Marcus Efraimsson
ab458061e6 Merge pull request #12441 from grafana/12430_fix
Fix footer CSS issue
2018-06-28 14:25:08 +02:00
Marcus Efraimsson
54420363d3 fix footer css issue 2018-06-28 14:02:42 +02:00
Tobias Skarhed
af0a4a6039 Karma to Jest: 3 test files (#12414)
* Karma to Jest: viewstate_srv

* Karma to Jest: annotations_srv

* Remove comments

* Karma to Jest: series_override_ctrl

* Remove unnecessary code

* Class to function and fix lint error

* Fix ngInject
2018-06-28 04:43:23 -07:00
Torkel Ödegaard
7a7c6f8fab fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438 2018-06-28 04:38:23 -07:00
Tobias Skarhed
443ff5deb4 Karma to Jest: value_select_dropdown (#12435)
* Begin Karma 2 Jest: value_select_dropdown

* Add return for Promise

* Remove Karma test
2018-06-28 03:10:36 -07:00
Dan Cech
3056d9a80e support passing api token in Basic auth password (#12416) 2018-06-28 03:08:32 -07:00
Tobias Skarhed
c2381f088f Add disabled styles for checked checkbox (#12422) 2018-06-28 03:02:49 -07:00
Marcus Efraimsson
3cf6a1a94b changelog: add notes about closing #11920
[skip ci]
2018-06-27 15:17:15 +02:00
Marcus Efraimsson
18032b374b changelog: add notes about closing #11920
[skip ci]
2018-06-27 15:11:44 +02:00
Marcus Efraimsson
f1ab1a26e9 changelog: update
[skip ci]
2018-06-27 14:48:55 +02:00
Marcus Efraimsson
6fa87e6278 docs: upd what's new in v5.2 2018-06-27 14:20:36 +02:00
Marcus Efraimsson
b011444246 release 5.2.0 2018-06-27 11:39:04 +02:00
Marcus Efraimsson
e378f6db88 docs: update index with link to what's new in 5.2 instead of 5.0 2018-06-27 11:35:53 +02:00
Marcus Efraimsson
ec3a4e105f changelog: add notes about closing #12385
[skip ci]
2018-06-26 18:11:56 +02:00
Marcus Efraimsson
06daae2179 Merge pull request #12412 from grafana/12393_login
login: fix layout issues
2018-06-26 18:01:54 +02:00
Marcus Efraimsson
8d535dd90d docs: upd what's new in v5.2
[skip ci]
2018-06-26 15:42:34 +02:00
Marcus Efraimsson
e256c61b54 docs: upd what's new in v5.2 2018-06-26 15:37:22 +02:00
Marcus Efraimsson
9f02927761 login: fix layout issues 2018-06-26 15:19:57 +02:00
Marcus Efraimsson
bd805544c5 build: yarn should be included out of the box on circle ci 2018-06-26 15:19:04 +02:00
bergquist
8ff538be07 notifier: handle known error first 2018-06-26 14:13:45 +02:00
Augustin
ef0bf9f701 ensure that if the dasboardID is negative, it will not bypass the checking of the right (#12398) 2018-06-26 05:12:20 -07:00
Marcus Efraimsson
5a2cf5863d Merge pull request #12399 from grafana/12140_docs
docs: update installation instructions
2018-06-26 10:37:22 +02:00
Marcus Efraimsson
db12e8d52d changelog: add notes about closing #11968
[skip ci]
2018-06-26 10:32:32 +02:00
Marcus Efraimsson
ceba0490f8 Merge pull request #12395 from grafana/11968_variable_key_value
Set correct text in drop down when variable is present in url
2018-06-26 10:29:21 +02:00
Torkel Ödegaard
713a87fb5b Webpack 4 (WIP) (#12098)
* Webpack 4

* webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker

* Webpack 4

* webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker

* upgrade ts loader

* simplified splitChunks

* upgrade circle node image to v8

* webpack: minor changes, using the new mode option, removed unused awesome-typescript loader, investigating karma issue but no solution yet

* fix: change angular mocks version restriction to be more strict

* add babel-loader for HMR support, fix karma debug runner

* babel-loader to yarn.lock

* webpack: changed from ExtractTextPlugin  to MiniCssExtractPlugin, and updated the minification step to use new webpack4 optimization config section

* webpack: remove css minifcation from general css processing as it's done in the webpack optimization step

* limit vendors chunk to .ts and .js files

* fix: removed typescript compile error, wanted to see if we still got test failure for that

* tech: upgrade uglify-js, should be faster now
2018-06-26 01:28:37 -07:00
Aman
e11f6f5cdf Make pre/postfix coloring checkboxes inactive when gauge is active 2018-06-26 13:06:26 +05:30
Sven Klemm
682c684df3 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-26 09:26:35 +02:00
bergquist
f83306bb5b removes unused return object 2018-06-26 09:22:31 +02:00
Dan Cech
583df47c2f handle "dn" ldap attribute more gracefully (#12385)
* handle "dn" ldap attribute more gracefully

* use strings.ToLower
2018-06-26 00:14:55 -07:00
Torkel Ödegaard
dd7a653db9 Update ROADMAP.md 2018-06-26 08:59:37 +02:00
Carl Bergquist
1165d098b0 Merge pull request #12407 from pengwk/patch-1
Fix typo
2018-06-26 08:30:05 +02:00
peng weikang
e4669681c4 Fix typo 2018-06-26 14:04:54 +08:00
Austin Winstanley
7f166668f6 Merge branch 'master' into macros/sql 2018-06-25 20:14:25 +00:00
Austin Winstanley
52b475f965 Merge branch 'master' of https://github.com/grafana/grafana 2018-06-25 20:13:50 +00:00
Austin Winstanley
c35c1d7270 Merge branch 'master' of https://github.com/grafana/grafana into macros/sql 2018-06-25 20:13:34 +00:00
Austin Winstanley
105b3d6804 Switched MySQL and MSSQL macros for timeFilter and related to use BETWEEN and calculate UNIX time server side instead of database side. Fixes #11618 #11619 2018-06-25 20:11:58 +00:00
Marcus Efraimsson
31239f33ed docs: update installation instructions 2018-06-25 17:22:31 +02:00
Carl Bergquist
175e95abb0 Merge pull request #12396 from bergquist/routing
routing: allows routes to be added to existing groups
2018-06-25 17:17:14 +02:00
bergquist
4a46dd886b routing: raise panic if duplicate routes are added 2018-06-25 16:58:49 +02:00
bergquist
dbfafa1cb5 routing: allows routes to be added to existing groups
this enables services to add routing to ex /api
without causing conflicts.
2018-06-25 16:50:27 +02:00
Marcus Efraimsson
c23f9a1f37 changelog: add notes about closing #11868
[skip ci]
2018-06-25 16:32:32 +02:00
Marcus Efraimsson
2b3bfd2f65 Merge pull request #12198 from grafana/11868_missing_phantom
enhance error message if phantomjs executable is not found
2018-06-25 16:27:12 +02:00
Marcus Efraimsson
f106de0efd enhance error message if phantomjs executable is not found
if arm build, explain that phantomjs is not included by default in arm
builds. If not explain that phantom js isn't installed correctly
2018-06-25 16:06:52 +02:00
Torkel Ödegaard
132df4553c fix: annnotation api & sql issue 2018-06-25 16:03:38 +02:00
Marcus Efraimsson
ed1fec8e0f changelog: add notes about closing #12248
[skip ci]
2018-06-25 15:24:12 +02:00
Marcus Efraimsson
98a7f258af Merge pull request #12392 from dehrax/12248-fix
Fix selecting current dashboard from search does not reload dashboard
2018-06-25 15:21:24 +02:00
Marcus Efraimsson
5280084480 set correct text in drop down when variable is present in url using key/values 2018-06-25 14:59:28 +02:00
Augustin
eb4d860fcb Light improve of massive delete annotation api (#12390)
* fix delete annotations

* fix self assignment

* add right unit test using admin role
2018-06-25 04:58:49 -07:00
Tobias Skarhed
762ee203fa Fix 12248 2018-06-25 13:46:33 +02:00
PedroD
3bf12e4ff5 Fixing wrong /public path, relative to the webpack.dev script, that would avoid webpack from cleaning previous builds. (#12351) 2018-06-25 04:45:47 -07:00
Marcus Efraimsson
7797a66b58 changelog: add notes about closing #12383
[skip ci]
2018-06-25 13:17:33 +02:00
Marcus Efraimsson
1726f6358f Merge pull request #12383 from CorpGlory/master
Set $rootScope in DatasourceSrv
2018-06-25 11:14:55 +02:00
bergquist
e0ac31a28a changelog: adds note about closing #12313 2018-06-25 08:02:51 +02:00
Carl Bergquist
15bbe81fed Merge pull request #12387 from AustinWinstanley/master
Return a 404 when deleting a datasource through the API if it doesn't…
2018-06-25 07:49:18 +02:00
Austin Winstanley
defb0396b7 Return a 404 when deleting a datasource through the API if it doesn't exist and add a test for it to confirm #12313 2018-06-22 21:15:36 -05:00
rozetko
97db9ece98 Set $rootScope in DatasourceSrv 2018-06-22 16:17:02 +03:00
Aman
1dd65f7a39 Add options to colorize prefix and postfix in singlestat 2018-06-22 14:50:04 +05:30
Daniel Lee
b2187b70a7 Merge pull request #11990 from mtanda/issue_11925
fix "Cloudwatch panel does not allow arbitrary variable values in query"
2018-06-21 18:00:49 +02:00
bergquist
eaf5b1c1cf devenv: adds dashboard with multiple rows 2018-06-21 16:31:10 +02:00
Daniel Lee
75e378b689 Merge pull request #12367 from dehrax/12224-history-ctrl
Karma to Jest: history_ctrl
2018-06-21 14:52:01 +02:00
bergquist
4b8b4e171a changelog: adds note about closing #10971 2018-06-21 14:31:55 +02:00
Carl Bergquist
828fb39ee2 Merge pull request #11643 from mrsiano/generic_oauth
Pass configured/auth headers to a Datasource.
2018-06-21 14:21:59 +02:00
mrsiano
cc1e3a0e3c Pass configured/auth headers to a Datasource.
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
2018-06-21 14:58:05 +03:00
Daniel Lee
6871f4c14e Merge pull request #12018 from forzafootball/am/fix-query-variable-influxdb
Conditionally select a field to return in ResponseParser for InfluxDB
2018-06-21 12:25:15 +02:00
Tobias Skarhed
4c31173853 Karma to Jest: history_ctrl. .gitingore: .vs/ 2018-06-21 11:54:47 +02:00
Carl Bergquist
e17944db15 Merge pull request #12325 from albundy83/patch-1
Fix error in InfluxDB query
2018-06-21 10:57:26 +02:00
Marcus Efraimsson
8ba869ac72 changelog: add notes about closing #12359
[skip ci]
2018-06-21 10:50:28 +02:00
Marcus Efraimsson
45610ecd89 Merge pull request #12363 from grafana/12359_sign_rpm_packages
build: fix signing of multiple rpm packages
2018-06-21 10:45:09 +02:00
Marcus Efraimsson
e617e23927 build: fix signing of multiple rpm packages 2018-06-21 10:27:59 +02:00
Marcus Efraimsson
8b5d78a63e docs: what's new in v5.2 and docker installation updates
[skip ci]
2018-06-20 18:53:17 +02:00
bergquist
503c8cd8ef tech: adds comments about route register code 2018-06-20 16:55:42 +02:00
Marcus Efraimsson
cce9632837 changelog: add notes about closing issue
https://github.com/grafana/grafana-docker/issues/170
[skip ci]
2018-06-20 15:38:13 +02:00
Tobias Skarhed
d00e2c20cf Karma to Jest: history_ctrl. Update version: ts-jest 2018-06-20 15:25:57 +02:00
Marcus Efraimsson
5a5601a8d2 changelog: add notes about 5.2.0-beta2
[skip ci]
2018-06-20 13:56:24 +02:00
Marcus Efraimsson
76df428ea2 changelog: add notes about closing #12240
[skip ci]
2018-06-20 13:54:57 +02:00
Marcus Efraimsson
3199287ce0 changelog: add notes about closing #12256
[skip ci]
2018-06-20 13:20:03 +02:00
Marcus Efraimsson
051ddb245d Merge pull request #12346 from grafana/12256_export
Make sure to process panels in collapsed rows when exporting dashboard
2018-06-20 13:17:32 +02:00
Marcus Efraimsson
9532cfee5f changelog: add notes about closing #11792
[skip ci]
2018-06-20 13:16:23 +02:00
Marcus Efraimsson
296a841685 Merge pull request #12123 from alexanderzobnin/fix-11792
graph: fix legend decimals precision calculation
2018-06-20 13:08:17 +02:00
Marcus Efraimsson
ae07fc29e2 changelog: add notes about closing #12315
[skip ci]
2018-06-20 13:04:39 +02:00
Marcus Efraimsson
2cbec532ee Merge pull request #12345 from grafana/12315_dash_links
Fix dashboard drop down links
2018-06-20 13:00:17 +02:00
Marcus Efraimsson
4ef4a4d3a7 dashboard: fix drop down links 2018-06-20 12:41:11 +02:00
Daniel Lee
a795715d2f Merge pull request #12350 from grafana/12240_save_modal_regression
Fix regressions after save modal changes
2018-06-20 10:40:49 +02:00
Carl Bergquist
578a8e8f55 Merge pull request #12322 from bergquist/sqlstore_refactoring
expose session and transaction helpers to other services
2018-06-20 10:22:06 +02:00
Marcus Efraimsson
41ac8d4cd5 fix regressions after save modal changes of not storing time and variables per default
Fix problem with adhoc variable filters not handled.
Fix problem with saving variables and time per default when saving a
dashboard as/first time.
Fix updating dashboard model after save with saving time/variables
enabled so that next time you save you won't get checkboxes for save
time/variables unless any values changed.
Tests validating correctness if time/variable values has changed.
2018-06-20 09:52:29 +02:00
Tobias Skarhed
3a9a36d6cf Karma to Jest: history_srv (#12341)
* Karma to Jest: history_srv

* Fix TS errors

* Remove q, as it is not needed
2018-06-19 08:05:49 -07:00
Marcus Efraimsson
a2e08dc4e8 make sure to process panels in collapsed rows when exporting dashboard 2018-06-19 16:56:14 +02:00
Marcus Efraimsson
d450ec94eb changelog: add notes about closing #3132
[skip ci]
2018-06-19 15:04:49 +02:00
Marcus Efraimsson
f73c04086c docs: update installation instructions 2018-06-19 15:00:45 +02:00
Daniel Lee
e6c5a5a905 ldap: add note about config in Grafana 2018-06-19 14:41:17 +02:00
Marcus Efraimsson
b1cf1acb71 Merge pull request #10970 from mmolnar/master
ldap: allow use of DN in group_search_filter_user_attribute and member_of
2018-06-19 14:40:05 +02:00
Daniel Lee
40d760622e ldap: add note to dockerfile 2018-06-19 14:30:50 +02:00
Marcus Efraimsson
a60332d459 changelog: add notes about closing #12343
[skip ci]
2018-06-19 13:54:37 +02:00
Daniel Lee
94f39cb734 docs: Plugin review guidelines and datasource auth pages 2018-06-19 13:16:41 +02:00
Marcus Efraimsson
5377ad4e96 remove unused argument in default scenario of guardian test 2018-06-19 12:34:34 +02:00
Torkel Ödegaard
24d0b43e62 fix: fixed permission issue with api key with viewer role in dashboards with default permissions 2018-06-19 11:10:17 +02:00
Tobias Skarhed
8666c77cc9 Karma to Jest: time_srv (#12303)
* Begin Karma to Jest: time_srv

* Remove experimental fix

* location search stubs for each test

* Fix issue where time service was not available for other tests
2018-06-18 09:47:23 -07:00
Tobias Skarhed
5bf72fc9f4 Karma to Jest: team_details_ctrl (#12321) 2018-06-18 07:54:56 -07:00
Grégoire Bellon-Gervais
7b3652af67 Fix error in InfluxDB query
Minor error in sql query to retrieve annotations
2018-06-18 16:10:40 +02:00
bergquist
3479cf4b39 expose functions to use sessions 2018-06-18 14:50:36 +02:00
bergquist
2b849086a1 changelog: adds note about closing #11607
[skip ci]
2018-06-18 13:51:20 +02:00
Carl Bergquist
764a4247f5 Merge pull request #12274 from xapon/11607-cleanup
#11607 Cleanup time of temporary files is now configurable
2018-06-18 13:50:05 +02:00
bergquist
dd7a185a91 test commit for checking github permissions
[skip ci]
2018-06-18 11:41:28 +02:00
Marcus Efraimsson
9a4ccdf388 changelog: add notes about closing #12278
[skip ci]
2018-06-18 11:28:33 +02:00
bergquist
ffda5efc66 Merge branch 'master' into alerting_reminder
* master:
  changelog: add notes about closing #11076
  snapshot: copy correct props when creating a snapshot
  set current org when adding/removing user to org
  changelog: add notes about closing #10707
  Include the vendor directory when copying source in to Docker (#12305)
  changelog: adds note about closing #12199
  adds inTransactionCtx that calls inTransactionWithRetryCtx
  merge create user handlers
  transactions: start sessions and transactions at the same place
  cloudwatch: handle invalid time range
  make sure to use real ip when validating white listed ip's
  changelog: adds note about closing #12286
2018-06-18 11:26:31 +02:00
Marcus Efraimsson
9271e48513 Merge pull request #12317 from grafana/12278_snapshot_annotations
Copy correct annotation props when creating a snapshot
2018-06-18 11:24:04 +02:00
Marcus Efraimsson
b72c45f735 changelog: add notes about closing #11076
[skip ci]
2018-06-18 11:22:55 +02:00
Marcus Efraimsson
004142a1e4 Merge pull request #12263 from grafana/11076_current_org
Set current org when adding/removing user to org
2018-06-18 11:19:42 +02:00
Marcus Efraimsson
a738347957 snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +02:00
André Niemann
757e2b0b7e added comment to reason the id tag 2018-06-18 10:59:44 +02:00
Carl Bergquist
d6f4313c2f Merge pull request #12203 from bergquist/bus_multi_dispatch
bus: support multiple dispatch in one transaction
2018-06-18 10:54:05 +02:00
Marcus Efraimsson
6d48d0a80c set current org when adding/removing user to org
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
2018-06-18 09:30:01 +02:00
Marcus Efraimsson
ab9f0e8edd changelog: add notes about closing #10707
[skip ci]
2018-06-18 09:03:30 +02:00
Marcus Efraimsson
18167f1c18 Merge pull request #12299 from grafana/10707_whitelist
auth proxy: whitelist proxy ip instead of client ip
2018-06-18 09:00:41 +02:00
Tim Heckman
a2ff7629e0 Include the vendor directory when copying source in to Docker (#12305)
This change updates the `.dockerignore` file to no longer contain the `vendor/`
directory. When a Go project provides a `vendor/` directory within the
repository, the best practice is to build that project using their vendored
dependencies. By putting it in the `.dockerignore` file we prevent consumers
from easily doing that.

The `vendor/` directory is used to include all of the dependencies needed to
build a project. This makes it so that we can reproducibly build the project, at
any given commit, because the dependencies will always be present. Also, using
the vendor directory avoids us needing to continually re-download all the
dependencies, and it protects us from build failures if GitHub is down or a
dependency gets removed or renamed.

In addition to the change above, this also removes an extra `/tmp` entry from
the `.dockerignore` file.

Fixes #12304

Signed-off-by: Tim Heckman <t@heckman.io>
2018-06-17 22:38:37 -07:00
bergquist
6782be80fd changelog: adds note about closing #12199 2018-06-16 16:59:15 +02:00
Carl Bergquist
e2adb4ced5 Merge pull request #12302 from grafana/12199_cloudwatch_panic
cloudwatch: handle invalid time range
2018-06-16 16:57:23 +02:00
bergquist
83a12afc07 adds tests for journaling sql operations 2018-06-16 11:27:04 +02:00
Sven Klemm
6c7984a840 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-16 10:36:50 +02:00
bergquist
c21938d4c4 use epoch to compare timestamp 2018-06-16 00:03:13 +02:00
bergquist
4c5fe68e7e adds inTransactionCtx that calls inTransactionWithRetryCtx 2018-06-15 21:57:13 +02:00
bergquist
1181e96799 merge create user handlers 2018-06-15 21:23:57 +02:00
bergquist
da91b91b4b transactions: start sessions and transactions at the same place
this make it possible for handler to use `withSession` when
transactions is not nedded and `inTransactionCtx` if its needed
without knowing who owns the session/transaction
2018-06-15 20:52:57 +02:00
bergquist
72224dbe37 adds info about eval/reminder interval 2018-06-15 16:53:35 +02:00
bergquist
12bf5c225a tests for defaultShouldNotify 2018-06-15 16:27:20 +02:00
Marcus Efraimsson
c02dd7462a cloudwatch: handle invalid time range 2018-06-15 15:48:25 +02:00
bergquist
f4b089d551 notifications: make journaling ctx aware 2018-06-15 15:30:17 +02:00
Marcus Efraimsson
b418e14bd9 make sure to use real ip when validating white listed ip's 2018-06-15 15:29:43 +02:00
Francisco Guimarães
acdc2bf100 Adding Cloudwatch AWS/AppSync metrics and dimensions 2018-06-15 10:11:32 -03:00
bergquist
7632983c62 notifications: gather actions in one transaction 2018-06-15 14:27:16 +02:00
bergquist
0cfdebf0a2 Merge remote-tracking branch 'fork/bus_multi_dispatch' into alerting_reminder
* fork/bus_multi_dispatch:
  sql: adds tests for InTransaction
  bus: noop should still execute fn
  removes unused code
  bus: Dispatch now passes empty ctx if handler require it
  bus: dont start transaction when creating session
  bus: dont mix ctx/classic handlers
  bus: DispatchCtx can now invoke any handler
  refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
  refactoring: transaction manager PR #12203
  fixes typo in code
  check if admin exists or create one in one transaction
  replace begin/end with wrapper function
  bus: support multiple dispatch in one transaction
2018-06-15 13:17:24 +02:00
bergquist
4be6ef4ab3 changelog: adds note about closing #12286 2018-06-15 12:47:53 +02:00
bergquist
09e71e00a3 sql: adds tests for InTransaction 2018-06-15 12:46:20 +02:00
bergquist
03dae10e79 bus: noop should still execute fn 2018-06-15 12:46:20 +02:00
bergquist
a3ee778ddb removes unused code 2018-06-15 12:46:20 +02:00
bergquist
9c1758b593 bus: Dispatch now passes empty ctx if handler require it 2018-06-15 12:46:20 +02:00
bergquist
9ca9a7c302 bus: dont start transaction when creating session 2018-06-15 12:46:20 +02:00
bergquist
629eab0b1e bus: dont mix ctx/classic handlers 2018-06-15 12:46:20 +02:00
bergquist
e2275701d8 bus: DispatchCtx can now invoke any handler 2018-06-15 12:46:20 +02:00
Torkel Ödegaard
5af0b924ff refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203 2018-06-15 12:46:20 +02:00
Torkel Ödegaard
442e0e437b refactoring: transaction manager PR #12203 2018-06-15 12:46:20 +02:00
bergquist
6775a82c82 fixes typo in code 2018-06-15 12:46:20 +02:00
bergquist
1bd31aa313 check if admin exists or create one in one transaction 2018-06-15 12:46:20 +02:00
bergquist
263572813a replace begin/end with wrapper function 2018-06-15 12:46:20 +02:00
bergquist
8143610024 bus: support multiple dispatch in one transaction
this makes it possible to run multiple DispatchCtx
in one transaction. The TransactionManager will
start/end the transaction and pass the dbsession
in the context.Context variable
2018-06-15 12:46:20 +02:00
bergquist
6cd83e182a Merge branch 'master' into alerting_reminder
* master: (84 commits)
  docs: adds info about grafana-dev container
  changelog: add notes about closing #12282
  Added Litre/min and milliLitre/min in Flow (#12282)
  remove papaparse dependency
  list name is deleteDatasources, not delete_datasources
  remove internal influx ifql datasource
  Document the endpoint for deleting an org
  tests: rewrite into table tests
  influxdb: adds mode func to backend
  changelog: add notes about closing #11484
  changelog: add notes about closing #11233
  Remove import
  Fix PR feedback
  Removed papaparse from external plugin exports
  Karma to Jest: query_builder
  dsproxy: move http client variable back
  Karma to Jest: threshold_mapper
  Expose react and slate to external plugins
  Karma to Jest: threshold_manager
  Karma to Jest: query_def, index_pattern
  ...
2018-06-15 12:45:35 +02:00
Carl Bergquist
e33d18701d Merge pull request #12287 from bergquist/fix_12286
Influxdb: add mode functions
2018-06-15 12:43:47 +02:00
Marcus Efraimsson
f0254c201a Merge pull request #12215 from ryantxu/use-ng-if-for-time
use ng-if for the panel timeInfo
2018-06-15 12:16:48 +02:00
Marcus Efraimsson
a02306bc75 Merge pull request #12295 from bergquist/docker_master
docs: adds info about grafana-dev container
2018-06-15 11:32:24 +02:00
bergquist
10d840b1cc docs: adds info about grafana-dev container 2018-06-15 11:07:23 +02:00
Marcus Efraimsson
551957fc4d changelog: add notes about closing #12282
[skip ci]
2018-06-15 10:57:19 +02:00
flopp999
2d1f59a9cc Added Litre/min and milliLitre/min in Flow (#12282)
units: Litre/min and milliLitre/min in Flow
2018-06-15 10:54:38 +02:00
Marcus Efraimsson
5f78ad583f remove papaparse dependency 2018-06-15 10:49:57 +02:00
Marcus Efraimsson
22c7c741eb Merge pull request #12252 from grafana/davkal/ifql-query
Internal Influx Flux plugin cleanup
2018-06-15 10:43:34 +02:00
Marcus Efraimsson
b62322b128 Merge pull request #12288 from mlclmj/master
docs: HTTP Endpoint for Deleting an Organization
2018-06-15 10:37:51 +02:00
Marcus Efraimsson
96287a9061 Merge pull request #12294 from vincent-fuchs/patch-1
docs: delete_datasources -> deleteDatasources in provisioning
2018-06-15 10:33:03 +02:00
Vincent Fuchs
c8becf57fa list name is deleteDatasources, not delete_datasources
fixes https://github.com/grafana/grafana/issues/12293
2018-06-15 12:19:53 +05:30
David Kaltschmidt
d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01:00
Malcolm Jones
2765afc830 Document the endpoint for deleting an org 2018-06-14 15:28:54 -04:00
bergquist
c63533f004 tests: rewrite into table tests 2018-06-14 20:33:36 +02:00
bergquist
bf4ee9bcc6 influxdb: adds mode func to backend
closes #12286
2018-06-14 20:33:22 +02:00
Marcus Efraimsson
56628996b7 Merge pull request #12280 from dehrax/12224-elastic-response
karma to jest: 6 test files
2018-06-14 17:24:36 +02:00
David Kaltschmidt
a9e1e5f346 Fix queryfield wrapper css 2018-06-14 16:20:48 +01:00
David Kaltschmidt
bbe6ab5096 Fix Queryfield metrics field missing 2018-06-14 16:20:33 +01:00
David Kaltschmidt
b2f497b100 batch DOM reads from query field typeahead 2018-06-14 16:20:21 +01:00
David Kaltschmidt
73ddf2c3ed hint support for typeahead 2018-06-14 16:20:09 +01:00
David Kaltschmidt
2ebda4bf4d Make suggestions an object 2018-06-14 16:19:55 +01:00
David Kaltschmidt
4113f7db47 Trigger typeahead on Ctrl-Space 2018-06-14 16:19:43 +01:00
David Kaltschmidt
0425b47791 refactor Explore query field 2018-06-14 16:19:29 +01:00
Marcus Efraimsson
0107491195 changelog: add notes about closing #11484
[skip ci]
2018-06-14 15:59:31 +02:00
Marcus Efraimsson
81d34137a8 Merge pull request #11484 from manacker/master
alerting: fix mobile notifications for microsoft teams notifier
2018-06-14 15:56:18 +02:00
Marcus Efraimsson
e6135ffd4f changelog: add notes about closing #11233
[skip ci]
2018-06-14 15:39:32 +02:00
Marcus Efraimsson
9dd38031e4 Merge pull request #11233 from flopp999/patch-2
units: W/m2(energy), l/h(flow) and kPa(pressure)
2018-06-14 15:36:38 +02:00
Tobias Skarhed
dbbd6b9b66 Remove import 2018-06-14 15:27:11 +02:00
Marcus Efraimsson
1626a66bab Merge pull request #12275 from dehrax/12224-exporter
karma to jest: exporter, playlist_edit_ctrl
2018-06-14 15:10:06 +02:00
Marcus Efraimsson
25e1d723c6 Merge pull request #12276 from grafana/davkal/expose-react-slate
Expose react and slate to external plugins
2018-06-14 14:41:30 +02:00
Tobias Skarhed
23abf044ff Fix PR feedback 2018-06-14 14:37:48 +02:00
David Kaltschmidt
5ec7d60e5f Removed papaparse from external plugin exports 2018-06-14 13:22:16 +01:00
Tobias Skarhed
ef0586acab Karma to Jest: query_builder 2018-06-14 14:20:42 +02:00
Marcus Efraimsson
284045748c Merge pull request #12243 from grafana/12236-ds-proxy-tokens
dsproxy: allow multiple access tokens per datasource
2018-06-14 14:03:08 +02:00
Marcus Efraimsson
99c188f626 Merge pull request #12273 from grafana/12247-link-icon
fix panel link icon positioning
2018-06-14 13:54:08 +02:00
Daniel Lee
10d30f0b73 dsproxy: move http client variable back
After refactoring to be able to mock the client in
a test, the client wasn't a global variable anymore.
This change moves the client back to being a package-
level variable.
2018-06-14 13:39:46 +02:00
Tobias Skarhed
283b39c397 Karma to Jest: threshold_mapper 2018-06-14 13:38:03 +02:00
David Kaltschmidt
eb686c06f2 Expose react and slate to external plugins
Experimental support for react in external plugins

- react
- slate (editor)
- papaparse (csv parsing)
- prismjs (syntax highlighting)

This is needed for new external datasource plugins like Flux
2018-06-14 12:32:57 +01:00
Tobias Skarhed
155ff06cbe Karma to Jest: threshold_manager 2018-06-14 13:22:17 +02:00
Tobias Skarhed
2465f53324 Karma to Jest: query_def, index_pattern 2018-06-14 12:18:11 +02:00
Tobias Skarhed
a911d36dea Remove import 2018-06-14 12:00:54 +02:00
Tobias Skarhed
04029a94cd Karma to Jest: elastic_response 2018-06-14 11:56:03 +02:00
Marcus Efraimsson
71b0326769 Merge pull request #12237 from dehrax/12224-version-panel
Convert tests from Karma to Jest
2018-06-14 10:13:46 +02:00
Patrick O'Carroll
8345e83bd6 changelog: notes about closing #12189 2018-06-14 10:05:11 +02:00
Anton Sergeyev
2565a8087c #11607 corrected file cleanup test 2018-06-14 13:00:07 +05:00
Patrick O'Carroll
9802d86783 Merge pull request #12189 from ryantxu/focus-panel-search
autoFocus the add-panel search filter, and add on enter
2018-06-14 09:54:41 +02:00
Anton Sergeyev
7818578d6a #11607 removed unnecessary conversion (from gometalinter) 2018-06-14 12:50:18 +05:00
Tobias Skarhed
a3552a60e1 Improve test readability 2018-06-14 09:46:36 +02:00
Anton Sergeyev
2024cf4b56 #11607 fixed formatting 2018-06-14 12:46:29 +05:00
Anton Sergeyev
516839d7b2 #11607 Cleanup time of temporary files is now configurable 2018-06-14 12:35:22 +05:00
Patrick O'Carroll
a0aa0b55e7 moved link icon in panel header 2018-06-14 09:24:51 +02:00
Tobias Skarhed
4dd9b8f324 Karma to Jest: playlist_edit_ctrl 2018-06-13 16:29:50 +02:00
Tobias Skarhed
94b8cbdc6a Karma to Jest: exporter 2018-06-13 15:15:36 +02:00
nikoalch
0cc8ccdaa5 Update graphite.md 2018-06-13 08:40:15 -04:00
Marcus Efraimsson
ff3db60e2e changelog: add notes about closing #10796
[skip ci]
2018-06-13 13:13:57 +02:00
Marcus Efraimsson
2288e01752 Merge pull request #12169 from alexanderzobnin/feat-10796
Import dashboard to folder
2018-06-13 13:10:52 +02:00
Marcus Efraimsson
c39979a557 Merge pull request #12255 from dehrax/docs-dev-grafana
Update "Building from source" docs
2018-06-13 12:46:45 +02:00
André Niemann
23c97d080f added id tag to Panels for html bookmarking on longer Dashboards 2018-06-13 10:07:47 +02:00
Alexander Zobnin
25504e84ed dashboard import to folder: minor fixes 2018-06-13 10:44:37 +03:00
Tobias Skarhed
c650b50c37 Docs: output location from build script 2018-06-13 09:37:14 +02:00
Carl Bergquist
d3a3e7cfd1 Merge pull request #12222 from PrincipalsOffice/remove-QueryOptionsCtrl-references
removed QueryOptionsCtrl references
2018-06-13 09:34:02 +02:00
Marcus Efraimsson
3b824a5e00 Merge pull request #12244 from kdombeck/patch-1
docs: correct provisioning link
2018-06-13 09:14:32 +02:00
Ken Dombeck
110522307a Correct Provisioning documentation link
It was pointing to Prometheus documentation instead.
2018-06-12 09:01:25 -07:00
Daniel Lee
719ebdc24d dsproxy: allow multiple access tokens per datasource
Changes the cache key for tokens to cache on datasource id +
route path + http method instead of just datasource id.
2018-06-12 17:39:38 +02:00
Daniel Lee
610a90b79a Merge pull request #12231 from dehrax/12224-graph-tooltip
Karma to Jest: graph-tooltip
2018-06-12 16:32:14 +02:00
Tobias Skarhed
72ecf72c45 Mock core in jest-setup 2018-06-12 16:14:22 +02:00
Tobias Skarhed
8155ce9804 Docs: Update Build from Source 2018-06-12 15:06:17 +02:00
Tobias Skarhed
d91e9ddd22 Convert tests from Karma to Jest 2018-06-12 13:54:07 +02:00
Marcus Efraimsson
d8f269954a changelog: add notes about closing #11963
[skip ci]
2018-06-12 13:10:48 +02:00
Patrick O'Carroll
0bb30b146c save-modal save button (#12047)
Disable save dashboard button when saving
2018-06-12 11:54:50 +02:00
Tobias Skarhed
da9a28f37d Karma to Jest: graph-tooltip 2018-06-11 15:59:20 +02:00
Jiang Ye
c92874875c removed QueryOptionsCtrl references 2018-06-09 16:06:03 -04:00
bergquist
dbaa45e51e update latest.json to 5.1.3 2018-06-09 21:26:07 +02:00
ryan
0a3ec93347 use ng-if 2018-06-08 15:49:30 +02:00
David Kaltschmidt
ab76864e61 hot-fix ifql testdatasource() 2018-06-08 14:56:48 +02:00
Carl Bergquist
5ed2880a8b Merge pull request #12202 from grafana/11486_sqlite
Upgrade mattn/go-sqlite3 to v1.7.0
2018-06-08 13:11:46 +02:00
Carl Bergquist
38864d74bd Merge pull request #12180 from grafana/deploy
Propagate specific git-sha into tarball and docker builds
2018-06-08 13:02:07 +02:00
bergquist
484d9e3f9d triggers grafana-docker master build 2018-06-08 12:44:01 +02:00
Patrick O'Carroll
77403b0dc1 changed som variables to values so it's the same for dark and light theme, added special styling for login text, link and input (#12196) 2018-06-07 11:03:58 -07:00
Marcus Efraimsson
c0830e9cde mattn/go-sqlite3 v1.6.0 to v1.7.0 2018-06-07 16:53:39 +02:00
Marcus Efraimsson
7d508df1b4 changelog: add notes about closing #11074
[skip ci]
2018-06-07 16:24:45 +02:00
Patrick O'Carroll
25f2960717 fixed so panel title doesn't wrap and (#12142)
dashboard: fix so panel titles doesn't wrap
2018-06-07 16:20:55 +02:00
Alexander Zobnin
24f6d34abd graph: fix legend decimals precision calculation 2018-06-07 16:02:44 +03:00
Ryan McKinley
1f32871f70 Use Passive eventListener for 'wheel' (#12106)
* make wheel passive

* remove console
2018-06-07 03:41:50 -07:00
Marcus Efraimsson
3fb4eb7322 Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting
Respect explore settings in config ini
2018-06-07 12:08:42 +02:00
ryan
09dbb52423 Merge remote-tracking branch 'grafana/master' into focus-panel-search
* grafana/master:
  nicer collapsed row behaviour (#12186)
  remove DashboardRowCtrl (#12187)
  Annotations support for ifql datasource
  Template variable support for ifql datasource
  Query helpers for IFQL datasource
2018-06-07 10:31:46 +02:00
David
82ae7c6eee Merge pull request #12167 from grafana/davkal/ifql-helpers
Query helpers, Annotations, and Template Variables for IFQL datasource
2018-06-07 10:24:21 +02:00
bergquist
4a8e9cf93f removes more unused code 2018-06-07 07:15:50 +02:00
bergquist
850aa21d45 removes unused code 2018-06-07 07:06:13 +02:00
Ryan McKinley
17a2ce13f0 nicer collapsed row behaviour (#12186)
* nicer collapsed row behavior

* don't block events

* use a div to toggle

* use singular name
2018-06-06 21:58:42 -07:00
Ryan McKinley
415ad8fbf3 remove DashboardRowCtrl (#12187) 2018-06-06 21:57:30 -07:00
ryan
c71608aae8 add panel on enter 2018-06-07 03:08:39 +02:00
ryan
37c45a81a9 autoFocus the search filter 2018-06-07 02:48:54 +02:00
bergquist
f93d83befe adds missing return statement 2018-06-06 22:17:19 +02:00
Sławek Piotrowski
9db964bf35 Fix typo: eleasticsearch -> elasticsearch (#12184) 2018-06-06 13:09:16 -07:00
David Kaltschmidt
cdba2bd184 Annotations support for ifql datasource 2018-06-06 16:11:40 +02:00
Alexander Zobnin
8fd3015e52 dashboard: improve import UX for non-editor users
validate folderId, import only into available folders
2018-06-06 15:35:19 +03:00
David Kaltschmidt
2c86484e54 Template variable support for ifql datasource
* Implements findMetricQuery()
* Macros for template queries: measurements(), tags(), tag_values(),
 field_keys()
* Tests for macro expansion
2018-06-06 14:11:48 +02:00
Tom Wilkie
c47f40d99c Use cut to trim down the SHA1.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2018-06-06 12:07:47 +01:00
Alexander Zobnin
9460063ab5 show import menu in sidenav, dashboard search and manage dashboards page
if user has editor permissions for at least one folder
2018-06-06 13:55:00 +03:00
David Kaltschmidt
3bd58446d6 Fix metrics panel test by adding config mock 2018-06-06 11:15:24 +02:00
David Kaltschmidt
661503f828 Respect explore settings in config ini
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
2018-06-06 10:50:47 +02:00
David Kaltschmidt
56fc82151b Add .html to webpack.hot resolve extensions 2018-06-06 09:12:06 +02:00
Sven Klemm
a05d694d31 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-05 23:21:46 +02:00
Tom Wilkie
681326140d Version the tarball uploaded to s3 and tell the next step about it.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2018-06-05 20:02:51 +01:00
Alexander Zobnin
4ff4ac1d5f dashboard: import into current folder from manage folder page 2018-06-05 20:01:48 +03:00
Alexander Zobnin
393f41cd14 dashboard: add Import button to manage page 2018-06-05 19:37:47 +03:00
Alexander Zobnin
4063ae37a4 dashboard: import to folder 2018-06-05 19:23:09 +03:00
David Kaltschmidt
d7379912c1 Query helpers for IFQL datasource
* raw CSV preview next to query field (query inspector is not that
 useful here)
* added result table and record counts
2018-06-05 17:15:35 +02:00
bergquist
171a38df99 alerting: fixes broken table rename 2018-06-05 14:29:48 +02:00
David
45a156577c Merge pull request #12143 from grafana/davkal/ifql-datasource
InfluxDB IFQL datasource (beta)
2018-06-05 14:23:21 +02:00
Leonard Gram
9e7651a1b3 docs: docker secrets available in v5.2.0 2018-06-05 13:54:23 +02:00
David Kaltschmidt
64f5874778 Remove round-robin urls in ifql DS 2018-06-05 13:49:35 +02:00
David Kaltschmidt
1d587450b3 IFQL range variable expansion 2018-06-05 13:42:32 +02:00
bergquist
ab70ead5e4 alerting: renames journal table to alert_notification_journal 2018-06-05 13:10:38 +02:00
bergquist
bcbae7aa62 alerting: move queries from evalcontext to notifier base 2018-06-05 12:07:02 +02:00
Carl Bergquist
05245e9b3d Merge pull request #12161 from bergquist/alerting_reminder_invert
alerting: invert sendOnce to sendReminder
2018-06-05 11:03:37 +02:00
Leonard Gram
eb66266629 changelog: release v5.2.0-beta1. 2018-06-05 10:57:18 +02:00
bergquist
7333d7b8d4 alerting: invert sendOnce to sendReminder 2018-06-05 10:44:17 +02:00
Marcus Efraimsson
cb9fc3f6b4 changelog: add notes about closing #11657
[skip ci]
2018-06-05 09:35:24 +02:00
bergquist
0c6d8398a1 alerting: remove zero units from duration 2018-06-05 08:42:39 +02:00
Carl Bergquist
6d27c3d0c5 Merge pull request #12154 from grafana/11657_server_admin
Always show server admin link in sidenav if grafana admin
2018-06-05 08:02:05 +02:00
bergquist
93124f38fa alerting: only check frequency when not send once 2018-06-04 22:19:27 +02:00
Marcus Efraimsson
962f996799 always show server admin link in sidenav if grafana admin 2018-06-04 19:28:01 +02:00
Marcus Efraimsson
d09749eaaa Merge pull request #12153 from grafana/googleOAuthDocs
update google auth config docs
2018-06-04 18:50:28 +02:00
Dan Cech
9b29a19609 update google auth config docs 2018-06-04 12:32:35 -04:00
Marcus Efraimsson
58406707f9 changelog: add notes about closing #11525
[skip ci]
2018-06-04 18:10:28 +02:00
Marcus Efraimsson
38c94bb633 Merge pull request #12117 from grafana/11525-dashlist-folder-picker
Fix search by folder in dashboard list panel
2018-06-04 18:08:38 +02:00
Torkel Ödegaard
9e59751c07 fix: fixed problem with expanding access mode help in ds settings 2018-06-04 18:05:16 +02:00
Torkel Ödegaard
ae82112c2e dep: use master branch for plugin model 2018-06-04 17:47:38 +02:00
bergquist
0e647db485 Merge branch 'master' into alerting_reminder
* master: (30 commits)
  changelog: add notes about closing #11882
  renamed variable in tests
  added comment, variableChange -> variableValueChange
  added a test
  added if to check if new variable has been added
  Gravatar fallback does not respect 'AppSubUrl'-setting (#12149)
  change admin password after first login
  changelog: adds note about closing #11958
  revert: reverted singlestat panel position change PR #12004
  Revert "provisioning: turn relative symlinked path into absolut paths"
  provisioning: turn relative symlinked path into absolut paths
  changelog: adds note about closing #11670
  elasticsearch: sort bucket keys to fix issue wth response parser tests
  docs: what's new in v5.2
  changelog: add notes about closing #11167
  docs: docker secrets support. (#12141)
  alerting: show alerts for user with Viewer role
  datasource: added option no-direct-access to ds-http-settings diretive, closes #12138
  provisioning: adds fallback if evalsymlink/abs fails
  tests: uses different paths depending on os
  ...
2018-06-04 17:44:18 +02:00
bergquist
86e65f84f9 alerting: fixes invalid error handling 2018-06-04 17:30:57 +02:00
David
95aef8241c Merge pull request #12146 from grafana/12144-new-variable-save
added if to check if new variable has been added
2018-06-04 17:26:48 +02:00
Patrick O'Carroll
d650dc94c9 fixed so default is all and general only show dashboards 2018-06-04 17:25:20 +02:00
Marcus Efraimsson
09a0a49c52 changelog: add notes about closing #11882
[skip ci]
2018-06-04 16:32:42 +02:00
Patrick O'Carroll
937b26f3fd added s to folderId in params 2018-06-04 16:28:24 +02:00
Patrick O'Carroll
89238b4a04 renamed variable in tests 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
b122f53085 added comment, variableChange -> variableValueChange 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
609b0fa498 added a test 2018-06-04 16:23:36 +02:00
Patrick O'Carroll
5e484e8393 added if to check if new variable has been added 2018-06-04 16:23:36 +02:00
Marcus Efraimsson
6281910591 Merge pull request #12037 from grafana/login-change-password
change admin password after first login
2018-06-04 16:21:45 +02:00
pari-
9680a3d44d Gravatar fallback does not respect 'AppSubUrl'-setting (#12149)
Closes #12148
2018-06-04 16:03:59 +02:00
David
b5c53aae97 Merge pull request #12108 from grafana/davkal/12001-explore-permissions
Restrict Explore UI to Editor and Admin roles
2018-06-04 16:01:39 +02:00
Patrick O'Carroll
cb6c6c8172 change admin password after first login 2018-06-04 16:01:09 +02:00
bergquist
574e92e1d8 changelog: adds note about closing #11958
[skip ci]
2018-06-04 16:00:44 +02:00
Carl Bergquist
7214ee9024 Merge pull request #12007 from bergquist/provisioning_symlinked_folders
Add support for symlinked folders in dashboard provisioning
2018-06-04 16:00:32 +02:00
Torkel Ödegaard
829af9425f revert: reverted singlestat panel position change PR #12004 2018-06-04 15:45:29 +02:00
bergquist
cd4026da6b Revert "provisioning: turn relative symlinked path into absolut paths"
This reverts commit d089b5e05d.
2018-06-04 15:38:37 +02:00
bergquist
d089b5e05d provisioning: turn relative symlinked path into absolut paths 2018-06-04 15:20:26 +02:00
Marcus Efraimsson
33ee1fba30 Merge pull request #12150 from grafana/12120_whats_new
Draft: What's new in v5.2
2018-06-04 15:17:31 +02:00
bergquist
c138ff2c90 changelog: adds note about closing #11670 2018-06-04 15:16:34 +02:00
Marcus Efraimsson
38906acda9 elasticsearch: sort bucket keys to fix issue wth response parser tests 2018-06-04 15:15:47 +02:00
Carl Bergquist
49d9235433 Merge pull request #12122 from grafana/provisioning_ha
Support provisioning in HA setup where modtime differs
2018-06-04 15:12:46 +02:00
Marcus Efraimsson
0d5579b4c0 docs: what's new in v5.2 2018-06-04 14:31:43 +02:00
Patrick O'Carroll
8419cc0553 made folder text smaller 2018-06-04 13:32:19 +02:00
John Baublitz
bdf433594a Implement code review changes 2018-06-04 13:19:14 +02:00
John Baublitz
5c5951bc42 Bug fix for repeated alerting even on OK state and add notification_journal cleanup when alert resolves 2018-06-04 13:19:14 +02:00
John Baublitz
c0a9e5cf1d Fix tests 2018-06-04 13:19:14 +02:00
John Baublitz
fca97535d1 Fix multiple bugs 2018-06-04 13:19:14 +02:00
John Baublitz
3cb0e27e1c Revert changes post code review and move them to notification page 2018-06-04 13:19:14 +02:00
John Baublitz
e068be4c26 Feature for repeated alerting in grafana 2018-06-04 13:19:13 +02:00
David Kaltschmidt
08ee1da6b1 InfluxDB IFQL datasource 2018-06-04 12:24:47 +02:00
Marcus Efraimsson
7453df2662 changelog: add notes about closing #11167
[skip ci]
2018-06-04 11:57:13 +02:00
Marcus Efraimsson
e258f30704 Merge pull request #12129 from alexanderzobnin/fix-11167
alert list panel: show alerts for user with viewer role
2018-06-04 11:54:51 +02:00
Leonard Gram
e562ae753b docs: docker secrets support. (#12141)
Closes #12132
2018-06-04 11:49:12 +02:00
Alexander Zobnin
13c6f37ea5 alerting: show alerts for user with Viewer role
changelog: add notes about closing #11167

remove changelog note

reformat alert_test.go
2018-06-04 12:34:30 +03:00
Torkel Ödegaard
feb5e20779 datasource: added option no-direct-access to ds-http-settings diretive, closes #12138 2018-06-04 11:17:50 +02:00
bergquist
f606654c50 provisioning: adds fallback if evalsymlink/abs fails 2018-06-04 09:04:33 +02:00
bergquist
3f5078339c tests: uses different paths depending on os 2018-06-04 08:27:03 +02:00
bergquist
75ee1e9208 renames intervalSeconds to updateIntervalSeconds 2018-06-04 08:13:20 +02:00
Sven Klemm
6220dec076 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-02 12:57:14 +02:00
Marcus Efraimsson
f5cf926364 changelog: add notes about closing #5893
[skip ci]
2018-06-01 15:23:26 +02:00
Marcus Efraimsson
b6afe5f2e8 Merge pull request #11380 from WPH95/feature/add_es_alerting
elasticsearch: alerting support
2018-06-01 15:17:28 +02:00
Patrick O'Carroll
83a73327cf removed italic 2018-06-01 15:16:22 +02:00
Marcus Efraimsson
b67872bc35 changelog: add notes about closing #11500, #8168, #6541
[skip ci]
2018-06-01 14:49:14 +02:00
Patrick O'Carroll
0c269d64d0 Alert panel filters (#11712)
alert list panel: filter alerts by name, dashboard, folder, tags
2018-06-01 14:36:40 +02:00
Marcus Efraimsson
ce75afa413 docs: update alerting docs with alerting support for elasticsearch 2018-06-01 12:26:20 +02:00
Patrick O'Carroll
18e4271abd added span with folder title that is shown for recently and starred, created a new class for folder title 2018-06-01 10:34:57 +02:00
David
13a9701581 Update CHANGELOG.md
- added Prometheus query date alignment
2018-06-01 10:13:48 +02:00
bergquist
333af6fd9b provisioning: makes the interval for polling for changes configurable 2018-05-31 21:07:34 +02:00
bergquist
c817aecd66 provisioning: only update dashboard if hash of json changed 2018-05-31 21:05:52 +02:00
Marcus Efraimsson
b8ff3b1e3f remove dead code 2018-05-31 19:05:32 +02:00
Marcus Efraimsson
dcac63936b elasticsearch: minor refactor
Handle all replacements if interval template variables in the client.
Fix issue with client and different versions.
Adds better tests of the client
2018-05-31 19:02:20 +02:00
Marcus Efraimsson
28f0acd854 Merge branch 'master' into feature/add_es_alerting 2018-05-31 16:33:07 +02:00
Marcus Efraimsson
a2cd05f6db changelog: update
[skip ci]
2018-05-31 16:31:53 +02:00
Marcus Efraimsson
67410f7a4d changelog: add notes about closing #10748, #8805
[skip ci]
2018-05-31 15:48:19 +02:00
Patrick O'Carroll
37f9bdfc8c save modal ux improvements (#11822)
changes to save modal when saving an updated dashboard

Changed time range and variables are now not saved by default, 
you'll need to actively choose if you want to save updated time 
range and or variables.
2018-05-31 15:40:57 +02:00
Marcus Efraimsson
938deae4b4 changelog: add notes about closing #11515
[skip ci]
2018-05-31 15:24:01 +02:00
Marcus Efraimsson
a1b20bf69a Merge pull request #12092 from grafana/11515_import_uid
Validate uid when importing dashboards
2018-05-31 15:18:24 +02:00
bergquist
44f5b92fbc provisioning: only provision if json file is newer then db 2018-05-31 11:38:29 +02:00
David Kaltschmidt
0c45ee63a9 Guard /explore by editor role on the backend 2018-05-31 11:26:24 +02:00
bergquist
2bd4c14e5f make path absolute before following symlink 2018-05-31 09:53:15 +02:00
bergquist
47d3884377 provisioning: follow symlinked folders
fixes #11958
2018-05-31 09:38:09 +02:00
bergquist
d5aeae3a90 test: fixes broken test on windows 2018-05-31 08:27:29 +02:00
Carl Bergquist
5c30643f6e Merge pull request #12101 from bergquist/devenv
devenv: initial scripts for setting up devenv
2018-05-30 21:49:17 +02:00
Marcus Efraimsson
82ba27b5f2 changelog: add notes about closing #11771
[skip ci]
2018-05-30 21:31:31 +02:00
Marcus Efraimsson
d2296d332e Merge pull request #12107 from grafana/davkal/11771-hide-gridcontrols
Fix CSS to hide grid controls in fullscreen/low-activity views
2018-05-30 21:29:24 +02:00
Marcus Efraimsson
a4b1dd036d changelog: add notes about closing #11971
[skip ci]
2018-05-30 18:11:47 +02:00
Patrick O'Carroll
b894b5e669 Fix singlestat threshold tooltip (#12109)
fix singlestat threshold tooltip
2018-05-30 18:09:57 +02:00
Leonard Gram
b379b28337 build: only runs db related tests on db. 2018-05-30 16:27:47 +02:00
Leonard Gram
e33b17fac6 build: integration testing postegres on ci. 2018-05-30 16:27:47 +02:00
Leonard Gram
50d1519a91 build: mysql integration testing on ci. 2018-05-30 16:27:47 +02:00
David Kaltschmidt
827fb7e8de Fix karma tests that rely on MetricsPanelCtrl 2018-05-30 15:24:47 +02:00
Leonard Gram
21ecaae6ff changelog: Second epochs are now correctly converted to ms. 2018-05-30 14:30:01 +02:00
David Kaltschmidt
7224ca6c62 Fix panel menu test 2018-05-30 13:24:09 +02:00
David Kaltschmidt
f69654fcd5 Restrict Explore UI to Editor and Admin roles
Access is restricted via not showing in the following places:

* hide from sidemenu
* hide from panel header menu
* disable keybinding `x`

Also adds a `roles` property to reactContainer routes that will be
checked if `roles` is set, and on failure redirects to `/`.
2018-05-30 13:13:29 +02:00
David
7a3c1e162c Merge pull request #11942 from grafana/davkal/design-integration
Explore: Time selector, split view, design integration
2018-05-30 12:27:24 +02:00
David Kaltschmidt
ac1dda3b3a Fix CSS to hide grid controls in fullscreen/low-activity views
* there was a comma missing to hide the handles, fixed now
* added new styles to hide header interaction in full screen panels
2018-05-30 12:07:51 +02:00
David
40844614bf Merge pull request #12096 from grafana/davkal/11446-fix-systemjs-cachebust
Fix cache busting for systemjs imports for plugins
2018-05-30 10:05:46 +02:00
Marcus Efraimsson
f2942d94a5 changelog: add notes about closing #11645
[skip ci]
2018-05-30 09:26:15 +02:00
Kim Christensen
48fc5edda1 Support InfluxDB count distinct aggregation (#11658)
influxdb: support count distinct aggregation
2018-05-30 09:22:16 +02:00
bergquist
c7acbcdaf5 provisioning: enable relative path's
this commit enable relatives path for provisioning dashboards.
this enables easier dev setups
2018-05-30 08:46:44 +02:00
bergquist
f32e3a2960 changelog: note about closing #11858 2018-05-29 17:22:52 +02:00
Carl Bergquist
813a9a975f Merge pull request #12090 from grafana/11858_create_dashboard_link
Show create dashboard link if at least editor in one folder
2018-05-29 17:18:41 +02:00
bergquist
b253284acc devenv: improve readme 2018-05-29 16:52:02 +02:00
bergquist
1411709db1 provisioning: place testfiles within testdata folder 2018-05-29 16:30:12 +02:00
David
9b9e3962c5 Merge pull request #12072 from grafana/davkal/12024-fix-alignment
Changed Prometheus interval-alignment to cover whole panel range
2018-05-29 15:03:06 +02:00
Marcus Efraimsson
048ac3089b Merge branch 'master' into feature/add_es_alerting 2018-05-29 14:36:52 +02:00
Marcus Efraimsson
79575ea124 changelog: add notes about closing #11494
[skip ci]
2018-05-29 14:29:00 +02:00
Christophe Le Guern
3ba3fd9a59 Add new regions to handleGetRegions function (#12082)
As public/app/plugins/datasource/cloudwatch/partials/config.html and this file differ between the AWS regions available, I've updated the latest so they share the same data.
In that way, the regions() method in dashboards returns the same list as the frontend does.
2018-05-29 14:26:33 +02:00
Torkel Ödegaard
6e145ad32d Merge branch 'master' of github.com:grafana/grafana 2018-05-29 14:11:36 +02:00
Torkel Ödegaard
4c9b146bda PR: minor change to PR #12004 before merge 2018-05-29 14:11:05 +02:00
Marcus Efraimsson
2c8571a686 Merge pull request #12089 from bergquist/graphite_header
graphite: avoid distributed tracing headers in direct/browser mode
2018-05-29 14:07:18 +02:00
Torkel Ödegaard
249e682511 Merge branch 'master' of https://github.com/mammuthus/grafana 2018-05-29 14:04:54 +02:00
Torkel Ödegaard
be34417b3a fix: refactoring PR #11996 and fixing issue #11551 16706hashkey in json editors 2018-05-29 14:02:52 +02:00
bergquist
a1e6c31ec1 devenv: script for setting up default datasources 2018-05-29 14:00:46 +02:00
Torkel Ödegaard
634a26d2eb Merge branch 'remove_hash' of https://github.com/eMerzh/grafana 2018-05-29 13:25:44 +02:00
Torkel Ödegaard
ddd5e5ae70 tech: updated react-grid-layout to latest official release, closes #12100 2018-05-29 13:23:07 +02:00
David
c67d72db63 Merge pull request #12041 from grafana/davkal/11931-table-docs
Document table row merge for multiple queries
2018-05-29 12:08:55 +02:00
David Kaltschmidt
8bcd55d221 Fix cache busting for systemjs imports for plugins
* everything imported via systemjs in the path `plugin/` will get a
 timestamp appended for cache busting
* timestamp is set once on page load
* plugin css loader gets cache buster too
2018-05-29 12:01:10 +02:00
bergquist
6a82098ddf devenv: scripts for generating many unique dashboards 2018-05-29 11:52:00 +02:00
Marcus Efraimsson
e80f54c243 Merge pull request #12094 from grafana/elastic6-docker
docker: new block for elasticsearch6
2018-05-29 11:22:42 +02:00
Daniel Lee
fb41048dd7 docker: new block for elasticsearch6 2018-05-29 11:04:16 +02:00
Marcus Efraimsson
2d5ec9b9e4 changelog: add notes about closing #12087
[skip ci]
2018-05-29 10:50:13 +02:00
Marcus Efraimsson
1bc94c7d5a Merge pull request #12088 from thurt/12087-better-error-when-smtp-not-configured
inviting users: show friendlier error message when smtp is not configured
2018-05-29 10:46:46 +02:00
Leonard Gram
e6f2811b21 sql: seconds epochs are now correctly converted to ms.
Closes #12061
2018-05-29 08:44:03 +02:00
Marcus Efraimsson
7c3e8afd82 add validation of uid when importing dashboards 2018-05-28 22:34:40 +02:00
Brice Maron
01f80950de fix: add track by name in annotation list to avoid $$hashKey in json 2018-05-28 21:11:32 +02:00
bergquist
83b7bbd60b changelog: adds note about closing #9703 2018-05-28 20:55:11 +02:00
bergquist
add791b2cc Merge branch '9703-auth-proxy'
* 9703-auth-proxy:
  go fmt fixes
  configure proxy environments for Transport property
2018-05-28 20:49:40 +02:00
bergquist
d7b5fb4604 go fmt fixes 2018-05-28 20:48:01 +02:00
iyeonok
bafe25fbd9 configure proxy environments for Transport property
related issue: https://github.com/grafana/grafana/issues/9703
2018-05-28 20:48:01 +02:00
Marcus Efraimsson
7548d6f6d1 Show create dashboard link if at least editor in one folder 2018-05-28 20:37:39 +02:00
bergquist
e708e9ac3c graphite: avoid dtracing headers in direct mode
closes #11494
2018-05-28 20:35:19 +02:00
David Kaltschmidt
6d8d6cdb57 Fix sourcemaps for webpack hot config 2018-05-28 20:32:33 +02:00
thurt
b487aa3e6a return better error message when err is ErrSmtpNotEnabled
fixes #12087
2018-05-28 17:49:31 +00:00
Marcus Efraimsson
7cb0403faa elasticsearch: handle if alert query contains template variable
If datasource handles targetContainsTemplate function it can evaluate if a certain
query contains template variables and this is used for show an error message that
template variables not is supported in alert queries.
2018-05-28 19:45:18 +02:00
Marcus Efraimsson
e5e1683840 Merge branch 'master' into feature/add_es_alerting 2018-05-28 18:10:34 +02:00
bergquist
8d400b8f7b changelog: adds note about closing #9847 2018-05-28 17:50:36 +02:00
Ryan McKinley
17b9609209 Sparklines should scale to the data range (#12010)
* Add a full range option to sparklines

* line zero=false
2018-05-28 16:30:44 +02:00
Torkel Ödegaard
7b09dfe9a0 Merge branch 'davkal/split-webpack-config-hot' 2018-05-28 14:18:35 +02:00
David Kaltschmidt
ebe8e62bd5 Split webpack dev config into dev and hot
Motivation:

* too many conditionals for config, better to be explicit
* different priorities: faster build for hot mode
* working SCSS sources for styles in hot mode

The biggest differences:

* removed linter from TS loader in hot (should be editor or precommit
 or responsibility)
* simplified styles loading
* hot needs more extensions to resolve
* removed commons chunking for hot
* removed devServer from dev

Reduced HMR time from 8s to 4s on my machine.
2018-05-28 13:49:15 +02:00
David
ced8c5f0e4 Upgrade webpack loaders (#12081)
* upgrade all webpack loaders to recent version
* keep TS loader at 4.0.0 (5.0.0 requires webpack 4)
* remove unused json-loader
2018-05-28 13:46:57 +02:00
Marcus Efraimsson
5a96863eed pin versions of xorm to resolve sql tests
Resolves issue with postgres tests.
Also sets timezone of test instance and database to utc to resolve
mysql tests.
Closes #12065
2018-05-28 13:07:41 +02:00
Carl Bergquist
519e58a267 Merge pull request #12071 from grafana/12056_usage_stats
Additional anonymous usage stats
2018-05-28 11:23:16 +02:00
bergquist
a2ed0b15da build: fixes broken path for bra run
removes os and arch from binary path
when building in dev mode
2018-05-28 10:39:42 +02:00
Marcus Efraimsson
c9e9f25699 use sql builder for the get system stats sql query 2018-05-28 10:37:17 +02:00
Carl Bergquist
6c259eb04d Merge pull request #12077 from roidelapluie/logout
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
2018-05-28 08:06:00 +02:00
Mitsuhiro Tanda
e65cf5cbb5 fix directly specified variable rendering 2018-05-28 11:28:08 +09:00
Daniel Lee
de295af231 Merge pull request #12003 from mageo/master
Added Swiss franc currency
2018-05-28 01:13:21 +02:00
Sven Klemm
17b46804e8 remove unused function renderAdhocFilters 2018-05-27 19:39:43 +02:00
Sven Klemm
d77f9b2e74 send param in callback for get-param-options 2018-05-27 17:25:20 +02:00
Julien Pivotto
a5e6cb9a02 Fix #9847 Add a generic signout_redirect_url to enable oauth logout
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-05-27 14:52:50 +02:00
Sven Klemm
039e38d510 make separator configurable 2018-05-26 23:03:59 +02:00
Sven Klemm
291d732b36 fix error message 2018-05-26 20:53:01 +02:00
Sven Klemm
928353c628 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-26 13:37:00 +02:00
David Kaltschmidt
750ea9bbdd Changed Prometheus interval-alignment to cover whole panel range
* the existing query date alignment shifts the range forward to match
a multiple epoch of the interval, but keeps the range length the same,
the result is that the start date is shifted forward as well, leaving a
gap in the graph (or a zero-line when null-as-zero was set, issue #12024)
* this pr extends the aligned range to cover the original start date as
well
2018-05-25 16:46:38 +02:00
bergquist
238139fad6 alerting: refactor tests 2018-05-25 16:12:34 +02:00
Marcus Efraimsson
fbc44025dc add usage stats for datasource access mode 2018-05-25 16:06:35 +02:00
David Kaltschmidt
27e7a28b37 Review feedback (heading, typos)
* iff and therefor
* mention merge in heading
* add note about checking query inspector
2018-05-25 14:47:46 +02:00
Marcus Efraimsson
2ea5b6fe33 add additional usage stats metrics
nr of folders
nr of folder permissions
nr of dashboard permissions
nr of snapshots
nr of teams
nr of provisioned dashboards
2018-05-25 14:33:37 +02:00
Marcus Efraimsson
a6a12d36d7 add tests for sending usage stats 2018-05-25 13:32:55 +02:00
David Kaltschmidt
448b1cbc15 Integrated dark theme for explore UI 2018-05-25 12:51:27 +02:00
Marcus Efraimsson
4752d7884a elasticsearch: adds some more/better debug logging to client 2018-05-25 10:31:56 +02:00
bergquist
21ade3f64f changelog: fix broken link to contributor 2018-05-25 10:14:13 +02:00
bergquist
94ee9c63a8 changelog: adds note about closing #11788 2018-05-25 07:41:15 +02:00
balyn
fac0333f47 The old code for centering removed
Old code removed
2018-05-24 19:35:04 +03:00
Torkel Ödegaard
80d694d205 Backend image rendering as plugin (#11966)
* rendering: headless chrome progress

* renderer: minor change

* grpc: version hell

* updated grpc libs

* wip: minor progess

* rendering: new image rendering plugin is starting to work

* feat: now phantomjs works as well and updated alerting to use new rendering service

* refactor: renamed renderer package and service to rendering to make renderer name less confusing (rendering is internal service that handles the renderer plugin now)

* rendering: now render key is passed and render auth is working in plugin mode

* removed unneeded lines from gitignore

* rendering: now plugin mode supports waiting for all panels to complete rendering

* fix: LastSeenAt fix for render calls, was not set which causes a lot of updates to Last Seen at during rendering, this should fix sqlite db locked issues in seen in previous releases

* change: changed render tz url parameter to use proper timezone name as chrome does not handle UTC offset TZ values

* fix: another update to tz param generation

* renderer: added http mode to renderer service, new ini setting [rendering] server_url
2018-05-24 15:26:27 +02:00
Carl Bergquist
ca7bbc44c0 Merge pull request #12050 from aarongarciah/patch-1
Fix typo in README.md
2018-05-24 15:18:56 +02:00
Aarón García Hervás
4c5e1cacfe Fix typo in README.md 2018-05-24 12:39:11 +02:00
Leonard Gram
f80810081b build: updates publisher to support arm archs for deb and rpm. 2018-05-24 11:12:10 +02:00
David Kaltschmidt
f5e351af8b Explore split view
* button to bring a up a duplicate explore area to compare
* side by side rendering of two explore components
* right component has close button
* left component has page title
2018-05-24 10:55:01 +02:00
David Kaltschmidt
23c9da6162 Fixed custom dates for react timepicker
* added jest tests for timepicker component
2018-05-24 10:55:01 +02:00
David Kaltschmidt
eadaff6191 Explore: Design integration
* style header like other grafana components
* use panel container for graph and same styles for query field
* fix typeahead CSS selector (was created outside of .explore)
* use navbar buttons for +/- of rows
* moved elapsed time under run query button
* fix JS error on multiple timeseries being returned
* fix color for graph lines
* show prometheus query errors
2018-05-24 10:55:00 +02:00
David Kaltschmidt
0d3f24ce54 Explore: time selector
* time selector for explore section
* mostly ported the angular time selector, but left out the timepicker
 (3rd-party angular component)
* can be initialised via url parameters (jump from panels to explore)
* refreshing not implemented for now
* moved the forward/backward nav buttons around the time selector
2018-05-24 10:55:00 +02:00
Leonard Gram
7a30f72902 Merge pull request #12046 from fg2it/package
fix names of foreign arch packages
2018-05-24 09:34:15 +02:00
Dan Cech
417db13efb Fix dashboard snapshot deletion (#12025)
* fix issue deleting dashboard snapshots by deleteKey, add dedicated endopoint for authenticated requests, update frontend, tests & docs.
2018-05-24 08:55:16 +02:00
fg2it
22638db532 fix names of foreign arch packages 2018-05-23 23:53:59 +02:00
Marcus Efraimsson
16c3566a87 elasticsearch: handle NaN values 2018-05-23 22:57:46 +02:00
Marcus Efraimsson
688f5b830c elasticsearch: metric and pipeline agg setting json encoding fix 2018-05-23 22:21:41 +02:00
Marcus Efraimsson
4436b8da12 elasticsearch: query interval override fix 2018-05-23 22:07:52 +02:00
Marcus Efraimsson
8870e3e85b elasticsearch: default interval fix
5s instead of 15s
2018-05-23 21:44:09 +02:00
Marcus Efraimsson
ed110bc312 Merge pull request #11967 from grafana/migrate-jquery-lodash-extended-to-ts
chore: migrate files to ts
2018-05-23 17:58:37 +02:00
David Kaltschmidt
61b296afad Document table row merge for multiple queries
* added section to table feature docs
* marked as 5.0+ feature
* concrete examples of what works and the limits
2018-05-23 17:08:54 +02:00
Leonard Gram
0bfbb1c161 Merge pull request #11920 from grafana/crosscompile
Crosscompile and packages Grafana on arm, windows, linux and darwin
2018-05-23 17:03:25 +02:00
Marcus Efraimsson
242689abe2 elasticsearch: pipeline aggregation fix for json encoding 2018-05-23 16:46:26 +02:00
Leonard Gram
bea4741a12 build: always build for all platforms. 2018-05-23 16:03:21 +02:00
Marcus Efraimsson
dce59ccff2 fix: remove deadcode to make gometalinter happy 2018-05-23 15:28:36 +02:00
Marcus Efraimsson
4840adff00 elasticsearch: refactor query handling and use new es simple client
Removes moment dependency.
Adds response parser tests (based on frontend tests).
Adds time series query tests (based on frontend tests).
Fixes various issues related to response parsing and building search request queries.
Added support for extended stats metrics and geo hash grid aggregations.
2018-05-23 15:09:58 +02:00
Marcus Efraimsson
e171ed8910 elasticsearch: new simple client for communicating with elasticsearch
Handles minor differences of es 2, 5 and 5.6.
Implements index pattern logic.
Exposes builders for building search requests.
2018-05-23 14:59:12 +02:00
Marcus Efraimsson
77400cef08 elasticsearch: refactor and cleanup
Move time series query logic to specific file.
Remove model parser and move to time series query file, adds parser test.
2018-05-23 14:36:41 +02:00
Marcus Efraimsson
1324a67cbd Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-23 14:35:45 +02:00
Carl Bergquist
64053e1954 Merge pull request #11788 from mtanda/prom_query_timeout
add query timeout option for Prometheus
2018-05-22 09:40:29 +02:00
Leonard Gram
1b85b2fca7 build: removes deploy from nightly while testing it. 2018-05-22 09:07:52 +02:00
Daniel Lee
6d6b509d27 Merge pull request #12020 from xginn8/patch-1
update provisioning.md
2018-05-21 18:14:33 +02:00
xginn8
68bc9dd9dc update provisioning.md
stylize & name datasources properly
2018-05-21 11:19:44 -04:00
Aleksei Magusev
b7482ae8b7 Fix ResponseParser for InfluxDB to return only string values 2018-05-21 16:38:58 +02:00
Aleksei Magusev
e104e9b2c2 Conditionally select a field to return in ResponseParser for InfluxDB
This patch also fixes "value[1] || value[0]" to not ignore zeros.
2018-05-21 16:38:53 +02:00
Sven Klemm
cd49f2d425 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-21 15:58:31 +02:00
Leonard Gram
5f98982a09 build: clean up the workflow filters. 2018-05-21 15:57:57 +02:00
Daniel Lee
de7a880d66 Revert "Conditionally select a field to return in ResponseParser for InfluxDB"
This reverts commit a101177b55.

Ref #12009
2018-05-21 15:47:29 +02:00
Daniel Lee
80f8fb1e02 Revert "Fix ResponseParser for InfluxDB to return only string values"
This reverts commit 92e5968f91.

Ref #12009
2018-05-21 15:46:23 +02:00
Mitsuhiro Tanda
067ceb178e Revert "move queryTimeout option to common setting"
This reverts commit 3ba59a1d66a2a3c07ccd04a48c403f0772fbef31.
2018-05-21 21:45:51 +09:00
Mitsuhiro Tanda
12ace5ab65 move queryTimeout option to common setting 2018-05-21 21:45:51 +09:00
Mitsuhiro Tanda
8ddcd67080 add query timeout option for Prometheus 2018-05-21 21:45:51 +09:00
Carl Bergquist
a376de56f2 Merge pull request #11934 from liquidm/improve_alert_docs
Improve alert docs
2018-05-21 14:34:58 +02:00
Leonard Gram
7b1e41abc6 build: crosscompilation for nightlies and releases. 2018-05-21 14:06:01 +02:00
Sven Klemm
8b47d7c520 set style for registered query components 2018-05-21 12:53:06 +02:00
Sven Klemm
067bfa3f72 make param wrapper configurable 2018-05-21 12:52:14 +02:00
Sven Klemm
a5bcd8eac0 fix metric column when using group by 2018-05-21 12:10:18 +02:00
Sven Klemm
3af4e4e0d6 separate label in template from type 2018-05-21 11:44:37 +02:00
Marcus Efraimsson
cebae40468 Merge pull request #11973 from grafana/11953-explore-metricpanel
explore: fixes #11953
2018-05-21 11:13:22 +02:00
Sven Klemm
e93276b1f8 use sql part component 2018-05-21 11:10:00 +02:00
Sven Klemm
de9a117dc6 use sql part component 2018-05-21 11:04:52 +02:00
Sven Klemm
181dfdba04 add sql_part component 2018-05-21 09:37:04 +02:00
mammuthus
0cfdd726f7 Singlestat value: vertical alignment fix
There is a problem with vertical alignment of Singlestat value - it's a bit lower then it has to be.
This hack fix it.
2018-05-20 21:28:53 +03:00
Alexandre Georges
2e67e3ba63 Added Swiss franc currency 2018-05-20 14:07:40 +02:00
Sven Klemm
b12d049f6f quote column name in buildValueQuery 2018-05-19 17:21:53 +02:00
Sven Klemm
731c7520b3 return values quotes for suggestions in where expression 2018-05-19 15:34:48 +02:00
Sven Klemm
9e05477558 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-19 12:27:23 +02:00
bergquist
c40b0ea1df test: moves test files to testdata folder 2018-05-18 23:23:13 +02:00
Carl Bergquist
dd8c50e140 Merge pull request #11988 from bergquist/tag_release_script
build: script for tagging and pushing a release
2018-05-18 16:37:11 +02:00
Leonard Gram
7ca346e9f0 build: downloads and bundles phantomjs for darwin and windows. 2018-05-18 14:39:25 +02:00
Leonard Gram
3933cb6bf6 build: publisher updated to support more architectures and OSs. 2018-05-18 14:39:25 +02:00
Leonard Gram
803694f41b build: saves artifacts with the build 2018-05-18 14:39:25 +02:00
Leonard Gram
9123e0fca8 build: crossplatform build with packages.
Big thanks to @fg2it who created a POC as
well as the build container that this work
is based on.
2018-05-18 14:38:04 +02:00
Daniel Lee
5de2c99c32 Merge pull request #11976 from steakunderscore/master
Adds constant description for units
2018-05-18 13:29:10 +02:00
bergquist
f565800a51 build: script for tagging and pushing a release 2018-05-18 13:07:26 +02:00
Torkel Ödegaard
a73365c3fe codespell: fixes 2018-05-18 11:49:00 +02:00
Torkel Ödegaard
d0c17100cb fix: fixed some minor startup logging issues 2018-05-18 11:17:31 +02:00
Torkel Ödegaard
6c0752473a Sqlstore refactor (#11908)
* refactor: tracing service refactoring

* refactor: sqlstore to instance service

* refactor: sqlstore & registory priority

* refactor: sqlstore refactor wip

* sqlstore: progress on getting tests to work again

* sqlstore: progress on refactoring and getting tests working

* sqlstore: connection string fix

* fix: not sure why this test is not working and required changing expires

* fix: updated grafana-cli
2018-05-18 11:10:10 +02:00
Henry Jenkins
f7c9fe6abc Adds constant description for units
Makes `km/h` constant with distances
2018-05-17 17:55:13 +01:00
bergquist
78e837cf39 test: increase expire time to avoid tz issues in tests 2018-05-17 14:59:50 +02:00
Daniel Lee
f15919555b explore: fixes #11953 2018-05-17 14:56:15 +02:00
Patrick O'Carroll
1ab2928f9d migrated files to ts, removed unused functions from lodash_extended 2018-05-17 14:24:49 +02:00
Daniel Lee
75993971c6 docs: installation pages for 5.1.3 2018-05-16 21:48:26 +02:00
Daniel Lee
66c4a04dec changelog: add note for #11830 2018-05-16 17:46:32 +02:00
Daniel Lee
b086981e15 Merge pull request #11954 from grafana/11830-firefox-legend
legend: fixes Firefox/baron scroll bug
2018-05-16 16:49:42 +02:00
Daniel Lee
574baa7151 Merge pull request #11719 from mtanda/annotation_on_non_editable_dashboard
create annotation on non-editable dashboard
2018-05-16 15:18:32 +02:00
Daniel Lee
3305ac1f36 Merge pull request #11946 from grafana/11937-panel-content
scroll: temporary fix for double scrollbar issue
2018-05-16 15:16:44 +02:00
Daniel Lee
50026fad2e legend: fixes Firefox/baron scroll bug
Compensates for Firefox scrollbar calculation error in the baron framework.
Offsetwidth and clientwidth are used to find the width of the scrollbar. In
the legend these differ by 9px and cause the scroll div to grow by 9px for
every refresh. This fix compensates with a negative margin-right in that
case.

Fixes #11830
2018-05-16 15:08:22 +02:00
Patrick O'Carroll
b2027af4cb wrote classes 2018-05-16 13:37:26 +02:00
Patrick O'Carroll
d83f886519 migrated jquery.flot.events to ts 2018-05-16 13:37:26 +02:00
Mitsuhiro Tanda
87c9c47579 use canMakeEditable 2018-05-16 11:58:51 +09:00
Mitsuhiro Tanda
fe301142ba allow to add annotation for non editable dashboard 2018-05-16 11:51:28 +09:00
Daniel Lee
567fec402e scroll: temporary fix for double scrollbar issue
If #11939 is not merged in the patch release, then
this is a temporary fix for 5.1.3. It sets overflow to
hidden for larger screens and keeps the overflow set to
auto for mobiles and tablets.

Fixes #11937
2018-05-16 00:19:15 +02:00
Carl Bergquist
0841e67da8 Merge pull request #11940 from alexanderzobnin/plugin-meta-field
backend plugins: expose meta field
2018-05-15 20:20:28 +02:00
Alexander Zobnin
214b9af5a3 backend plugins: log an error if parsing meta field failed 2018-05-15 20:59:24 +03:00
Alexander Zobnin
4533f22871 backend plugins: expose meta field 2018-05-15 15:33:05 +03:00
Stuart McLean
c09c00a1f5 fixes following first code review 2018-05-15 10:06:26 +02:00
Stuart McLean
295169b94f add useful note to alerting api docs 2018-05-14 20:50:44 +02:00
Stuart McLean
2dd40eb4e4 improve alerting api docs sample responses 2018-05-14 20:50:08 +02:00
Marcus Efraimsson
b8c4aa3936 Merge pull request #11926 from grafana/davkal/fix-phantomjs-render
Use babel and hot loader only in yarn start
2018-05-14 13:47:35 +02:00
David
65f9970a3e Merge pull request #10434 from craig-miskell-fluxfederation/prometheus_align_queries
Align queries to prometheus with the step
2018-05-14 12:30:55 +02:00
David Kaltschmidt
a1b92369db Merge remote-tracking branch 'origin/master' into prometheus_align_queries
* origin/master: (21 commits)
  docs: removes notes about beeing introduced in 5.0
  lock caniuse-db version to resolve phantomjs rendering issue
  Update dashboard_permissions.md
  move database-specific code into dialects (#11884)
  refactor: tracing service refactoring (#11907)
  fix typo in getLdapAttrN (#11898)
  docs: update installation instructions targeting v5.1.2 stable
  changelog: add notes about closing #11862, #11656
  Fix dependencies on Node v10
  Update dashboard.md
  changelog: add notes about closing #10338
  Phantom render.js is incorrectly retrieving number of active panels (#11100)
  singlestat: render time of last point based on dashboard timezone (#11425)
  Fix for #10078: symbol "&" is not escaped (#10137)
  Add alpha color channel support for graph bars (#10956)
  interpolate 'field' again in Elasticsearch terms queries (#10026)
  Templating : return __empty__ value when all value return nothing to prevent elasticsearch syntaxe error (#9701)
  http_server: All files in public/build have now a huge max-age (#11536)
  fix: ldap unit test
  decrease length of auth_id column in user_auth table
  ...
2018-05-14 12:11:14 +02:00
David Kaltschmidt
e731c248d7 Prometheus step alignment: shift interval only on jitter
* only increase interval by step if jitter happened
* shift both start and end
* simplified tests by using low epoch numbers
2018-05-14 12:08:30 +02:00
David Kaltschmidt
dd66cbc847 Use babel and hot loader only in yarn start
* moved babel rules for hot reloading into TS loader
* toggling use of babel via HOT variable (true with `yarn start`)
* overriding webpack output when HOT to fix asset paths in dashboard
 urls like http://localhost:3333/d/...
2018-05-14 11:58:15 +02:00
bergquist
ca25a25386 docs: removes notes about beeing introduced in 5.0 2018-05-14 09:51:23 +02:00
Marcus Efraimsson
d3f516f1c4 Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-12 11:33:58 +02:00
Marcus Efraimsson
95285aa09f Merge pull request #11917 from grafana/fix_phantomjs
resolve phantomjs rendering in production build
2018-05-11 14:24:52 +02:00
Marcus Efraimsson
8ed856c64f lock caniuse-db version to resolve phantomjs rendering issue
For some reason a newer version of this sub-dependency makes phantomjs
rendering unable to generate and save a png image, however without
any error message logged
2018-05-11 14:10:54 +02:00
Marcus Efraimsson
26e1b3a3fa Merge pull request #11914 from b4456609/patch-1
docs: update dashboard_permissions.md
2018-05-11 09:21:23 +02:00
Bernie
1157542f70 Update dashboard_permissions.md
miss { in repsponse
2018-05-11 10:19:28 +08:00
Dan Cech
1dfff74da9 move database-specific code into dialects (#11884) 2018-05-10 16:54:21 +02:00
Torkel Ödegaard
27e1c67453 refactor: tracing service refactoring (#11907) 2018-05-10 16:51:55 +02:00
Dan Cech
bc64754364 fix typo in getLdapAttrN (#11898) 2018-05-09 20:26:17 +02:00
Marcus Efraimsson
486aaca109 docs: update installation instructions targeting v5.1.2 stable 2018-05-09 14:03:22 +02:00
Marcus Efraimsson
4dfaab4c5b changelog: add notes about closing #11862, #11656
[skip ci]
2018-05-09 10:45:40 +02:00
Daniel Lee
2c3b8bb035 Merge pull request #9910 from jeroenj/patch-1
Adding a user in a specified organisation uses the admin API
2018-05-08 23:09:25 +02:00
Daniel Lee
377b78102d Merge pull request #11888 from simPod/fix-node10
Fix dependencies on Node v10
2018-05-08 23:03:51 +02:00
Simon Podlipsky
4565676233 Fix dependencies on Node v10 2018-05-08 22:18:58 +02:00
Carl Bergquist
fa9a95f645 Merge pull request #11887 from simPod/patch-1
Update dashboard.md
2018-05-08 21:27:32 +02:00
Šimon Podlipský
ef60d89742 Update dashboard.md 2018-05-08 21:25:45 +02:00
Torkel Ödegaard
c79b1bef15 Merge branch 'master' into master 2018-05-08 21:23:34 +02:00
Marcus Efraimsson
cde347bd3d Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-08 17:13:08 +02:00
Marcus Efraimsson
77421531d0 changelog: add notes about closing #10338
[skip ci]
2018-05-08 16:18:54 +02:00
Adrian Muraru
5377b82612 Phantom render.js is incorrectly retrieving number of active panels (#11100)
Fixes #11099
2018-05-08 16:05:22 +02:00
Marcus Efraimsson
ef0b7bda6f singlestat: render time of last point based on dashboard timezone (#11425)
* singlestat: render time of last point based on dashboard timezone

* changelog: add note for #10338
2018-05-08 15:59:29 +02:00
Angrite
e52aceeaba Fix for #10078: symbol "&" is not escaped (#10137)
Fix for #10078: Render value as link in Table panel: ampersand symbol "&" is not escaped in link URL, resulting URL is wrong.
2018-05-08 15:47:09 +02:00
Chris Rice
10f934d287 Add alpha color channel support for graph bars (#10956)
* Set fillColor in bars on load and on color change

* Change bar fill color on color override

* Added test for series overrides

* Moved bars fill color setting into time_series. Fixed issue with prev commit where you could not show bars because of series overrides.
2018-05-08 15:18:57 +02:00
Andrew Richards
3095dabe3c interpolate 'field' again in Elasticsearch terms queries (#10026)
* interpolate 'field' again in Elasticsearch terms queries

Fix for #8662 which was regressed in commit e4950c2dc1 (the field 'field' was no longer interpolated)

* remove unnecessary check for existence of field 'field'
2018-05-08 15:17:16 +02:00
Seuf
1888708ca5 Templating : return __empty__ value when all value return nothing to prevent elasticsearch syntaxe error (#9701) 2018-05-08 14:04:20 +02:00
Thibaut Patel
bdb736a9ee http_server: All files in public/build have now a huge max-age (#11536) 2018-05-08 13:54:00 +02:00
Marcus Efraimsson
219118ef4a Merge pull request #11867 from grafana/11862_migration
decrease length of auth_id column in user_auth table
2018-05-08 13:10:22 +02:00
Torkel Ödegaard
869d8e6f0e fix: ldap unit test 2018-05-08 12:50:39 +02:00
David
06aca5e8b5 Merge branch 'master' into prometheus_align_queries 2018-05-08 12:22:55 +02:00
bergquist
65352dccc0 only error log when err is not nil 2018-05-08 11:59:27 +02:00
bergquist
b649358734 rename alerting engine to service 2018-05-08 11:56:30 +02:00
Tomasz Torcz
e1b9d361ed case-insensitive LDAP group comparison (#9926)
* ldap: case-insensitive LDAP group comparison

According to RFC2251 4.1.5, LDAP strings are case-insensitive. Disregard case when comparing group mappings.

* ldap: add test for case-insensitive group mapping
2018-05-08 11:47:23 +02:00
Marcus Efraimsson
3d9ea3f1fa changelog: add notes about closing #11813
[skip ci]
2018-05-08 11:36:05 +02:00
Torkel Ödegaard
4aae3c6c05 Merge branch 'master' of github.com:grafana/grafana 2018-05-08 11:33:13 +02:00
Torkel Ödegaard
cec783ca2c docs: updated changelog 2018-05-08 11:30:52 +02:00
Alexander Zobnin
00454b32f5 fix XSS vulnerabilities in dashboard links (#11813)
fix XSS vulnerabilities in dashboard links
2018-05-08 11:28:16 +02:00
Torkel Ödegaard
1c886940ff Merge branch 'jereksel-feature/save_json' 2018-05-08 11:25:20 +02:00
Torkel Ödegaard
eb3aa7b193 PR: ux changes to #11528 2018-05-08 11:24:20 +02:00
Torkel Ödegaard
6a5ce09b08 Merge branch 'feature/save_json' of https://github.com/jereksel/grafana into jereksel-feature/save_json 2018-05-08 10:54:26 +02:00
bergquist
7e9a10a5fb renames alerting engine to match other services 2018-05-08 10:53:42 +02:00
Dan Cech
93a8d8a25b allow analytics.js to be cached, enable anonymizeIP setting (#11656) 2018-05-08 10:48:27 +02:00
Torkel Ödegaard
a2b864dd6b Update CHANGELOG.md 2018-05-08 10:23:28 +02:00
Torkel Ödegaard
f84534adea Revert "Add baron scrollbar to a node managed by gafana (#11850)"
This reverts commit 34133671b9.
2018-05-08 09:45:08 +02:00
Torkel Ödegaard
4b61c7cd55 Merge branch 'influx-db-select-query-variable' 2018-05-08 09:29:53 +02:00
Marcus Efraimsson
8ed79d614b decrease length of auth_id column in user_auth table
certain mysql versions don't support having indices with a greater varchar length
than 190.
2018-05-08 09:26:28 +02:00
Carl Bergquist
8d13276844 Merge pull request #11852 from grafana/davkal/super-simple-docker
Support for local Docker builds
2018-05-08 09:17:01 +02:00
Torkel Ödegaard
b894a5ff16 Merge branch 'am/fix-query-variable-influxdb' of https://github.com/forzafootball/grafana into influx-db-select-query-variable 2018-05-08 09:01:58 +02:00
Patrick O'Carroll
8f0c8005af fixed svg background (#11848) 2018-05-08 06:40:34 +02:00
Ryan McKinley
34133671b9 Add baron scrollbar to a node managed by gafana (#11850)
* Add baron scroller to grafana panel, not plugin panel

* remove comment about root <div> element, since it will not be true
2018-05-08 06:39:12 +02:00
David
ed067e8d35 Fix CSS asset loading for yarn start (HMR) (#11855)
* enable url() processing in CSS to ensure assets load in HMR mode
* only needed when running `yarn start` which needs this for the hot
reloader
2018-05-07 17:02:55 +02:00
Torkel Ödegaard
4c6e4e2aa6 fix: fixed gometalinter issues with Discord PR 2018-05-07 17:01:31 +02:00
Carl Bergquist
23738ad4ac Merge pull request #11801 from grafana/provision-service-refactor
Server shutdown flow rewrite & provision service refactor
2018-05-07 16:32:26 +02:00
David
1236b7b918 Merge pull request #11770 from grafana/davkal/explore-panel-link
Explore: Add entry to panel menu to jump to Explore
2018-05-07 16:31:19 +02:00
Torkel Ödegaard
b170bde74f Update CHANGELOG.md 2018-05-07 15:44:34 +02:00
Torkel Ödegaard
c46a3c8646 Merge branch 'jereksel-feature/discord' 2018-05-07 15:41:10 +02:00
Torkel Ödegaard
e5e8b9800c merge: fixed conflicts in discord PR 2018-05-07 15:40:43 +02:00
Marcus Efraimsson
23c88a3b3f docs: update installation instructions targeting v5.1.1 stable 2018-05-07 14:57:18 +02:00
Dan Cech
29c9d3f74c fix root_url in docs & comments (#11819)
* fix root_url in docs & comments

* include ports in docker-compose config
2018-05-07 14:18:21 +02:00
Marcus Efraimsson
b804f6d999 changelog: 5.1.1 update
add notes about closing #11743 and add release data for 5.1.1
[skip ci]
2018-05-07 14:09:04 +02:00
Torkel Ödegaard
249c1e8d3d fix: loading of css url (images/fonts) 2018-05-07 14:02:38 +02:00
David Kaltschmidt
c3cc60b080 Support for local Docker builds
* add a git-ignored `local/` folder for Makefile/Dockerfile
* import `local/Makefile` to root Makefile
* add `.dockerignore`
2018-05-07 12:32:18 +02:00
Torkel Ödegaard
afec9ec5be Update ROADMAP.md 2018-05-07 11:16:59 +02:00
Dan Cech
543c7fe587 support additional fields in authproxy (#11661) 2018-05-07 10:39:16 +02:00
Dan Cech
b4ad044044 better handling for special chars in db config (#11662) 2018-05-07 10:33:33 +02:00
Florian Plattner
5d54bc00e1 Fix/improved csv output (#11740)
* fix: initial cleanup and implementation

* feat: finish special character escaping

* feat: updates fileExport to generate RFC-4180 compliant CSV

* chore: replace html decoder with the lodash version and final cleanup

* fix: restore character html decoding
2018-05-07 10:22:54 +02:00
Torkel Ödegaard
871b85f199 Update ROADMAP.md 2018-05-07 10:16:39 +02:00
Torkel Ödegaard
ec7703bad7 Update ROADMAP.md 2018-05-07 10:14:04 +02:00
Torkel Ödegaard
217d43e512 Update ROADMAP.md 2018-05-07 10:13:39 +02:00
Carl Bergquist
06623506d3 Merge pull request #11805 from simPod/missing-lock
Add missing items to Gopkg.lock
2018-05-07 10:08:05 +02:00
Torkel Ödegaard
fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Šimon Podlipský
1fbac909cb Remove preceding / from public JS path (#11804) 2018-05-07 08:11:48 +02:00
Ryan McKinley
2ee59ccad8 Add panel scrolling docs (#11826) 2018-05-07 08:03:30 +02:00
Marcus Efraimsson
e078e2733f Merge pull request #11803 from svenklemm/whatsnew51-table
Fix variable interpolation examples in whats new in 5.1 docs
2018-05-06 08:45:02 +02:00
Sven Klemm
1dd2bce054 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-05 13:33:54 +02:00
Sven Klemm
ed4dc241cc escape pipe symbol same way as in templating docs 2018-05-05 10:47:44 +02:00
Marcus Efraimsson
8523b1e410 changelog: add notes about closing #11616
[skip ci]
2018-05-04 15:03:30 +02:00
Marcus Efraimsson
d0753949bc Merge pull request #11794 from grafana/11616-timepicker-buttons
fix dark/light theme date selector styling in timepicker control
2018-05-04 14:55:56 +02:00
Patrick O'Carroll
515eab2405 added left:unset to counter left:0 in recent react-select release 2018-05-04 11:46:17 +02:00
Patrick O'Carroll
c897485958 fixed text color in light theme 2018-05-04 10:30:42 +02:00
Marcus Efraimsson
4d2e6b4a34 changelog: add notes about closing #11800
[skip ci]
2018-05-03 19:13:57 +02:00
Marcus Efraimsson
6eba9c2438 Merge pull request #11802 from svenklemm/variable-interpolation
dont shadow format passed in as function parameter in replace function in templatesrv
2018-05-03 19:09:40 +02:00
Sven Klemm
a806f542c6 test if default variable interpolation is effective when no specific
format is specified
2018-05-03 18:42:58 +02:00
Marcus Efraimsson
8a9da4ba66 changelog: notes about closing #11690
[skip ci]
2018-05-03 18:42:14 +02:00
Marcus Efraimsson
da8f6c150b Merge pull request #11751 from mtanda/11690
fix to match table column name and order
2018-05-03 18:33:46 +02:00
Daniel Lee
d518ed5330 changelog: add notes for ##11754, #11758, #11710 2018-05-03 15:46:21 +02:00
Daniel Lee
2c10f29b0f Merge pull request #11784 from grafana/11754_auth_migration
increase length of auth_id column in user_auth table
2018-05-03 15:30:38 +02:00
Daniel Lee
7db9cc3bf0 Merge pull request #11796 from alexanderzobnin/fix-11710
scroll: fix scrolling on mobile Chrome
2018-05-03 15:18:29 +02:00
Marcus Efraimsson
99257eb048 Merge branch 'master' of git://github.com/grafana/grafana into WPH95-feature/add_es_alerting 2018-05-03 12:03:04 +02:00
Alexander Zobnin
83d599670d scroll: remove firefox scrollbars 2018-05-03 11:54:02 +03:00
Simon Podlipsky
fc0a4b34a1 Add missing items to Gopkg.lock 2018-05-03 01:25:52 +02:00
Sven Klemm
f52920aa01 pipe escape try #3 2018-05-03 00:23:35 +02:00
Sven Klemm
7f8dacd087 use ascii code for pipe symbol to not mess up markdown table 2018-05-03 00:19:47 +02:00
Sven Klemm
fc7d876158 try to fix table 2018-05-03 00:17:18 +02:00
Sven Klemm
764fa15e24 dont shadow format passed in as function parameter 2018-05-02 23:03:37 +02:00
Torkel Ödegaard
c40a50829d fix: removed manully added http server from inject graph as it is now a self registered service 2018-05-02 21:30:15 +02:00
Torkel Ödegaard
b5e70d4607 fix: removed unused channel 2018-05-02 19:56:15 +02:00
Torkel Ödegaard
e3ea6c683c fix: comment spell fix 2018-05-02 19:56:15 +02:00
Torkel Ödegaard
23655315b8 fix: fixed race condition between http.Server ListenAndServe & Shutdown, now service crash during startup correctly closes http server every time 2018-05-02 19:56:15 +02:00
Torkel Ödegaard
d04ad835e2 refactoring: lots of refactoring around server shutdown flows, making sure process is terminated when background service has crashed 2018-05-02 19:56:15 +02:00
Torkel Ödegaard
053c2039bb refactor: provisioning service refactoring 2018-05-02 19:56:15 +02:00
Torkel Ödegaard
14bb7832af Metrics package now follows new service interface & registration (#11787)
* refactoring: metrics package now follows new service interface & registration

* fix: minor fix, make sure metrics service is imported, by grafana-server
2018-05-02 19:54:07 +02:00
Marcus Efraimsson
04d071aaa3 Merge pull request #11797 from grafana/revert-11775-unindent
Revert "Opportunities to unindent code (unindent)"
2018-05-02 14:19:55 +02:00
Marcus Efraimsson
de0d409a23 Revert "Opportunities to unindent code (unindent)" 2018-05-02 14:06:46 +02:00
Alexander Zobnin
64283408ee scroll: fix scrolling on mobile Chrome (#11710) 2018-05-02 12:43:25 +03:00
Marcus Efraimsson
6dcb9e696d changelog: add notes about closing #11625
[skip ci]
2018-05-02 11:19:22 +02:00
Marcus Efraimsson
f17100e98e Merge pull request #11786 from marefr/11625_save_as
dashboard: show save as button if user has edit permission

This will show the "Save As..." button in dashboard settings page if the user 
has edit permissions (org role admin/editor or viewers_can_edit enabled) 
and has at least edit permission in any folder.
2018-05-02 11:15:22 +02:00
Marcus Efraimsson
1f21b3e23b remove jest it.only to not skip important tests 2018-05-02 10:54:00 +02:00
Patrick O'Carroll
3dd073f98d fixed so all buttons are styled not just small ones, fixes #11616 2018-05-02 09:56:53 +02:00
Carl Bergquist
6ed69e3d93 Merge pull request #11775 from knweiss/unindent
Opportunities to unindent code (unindent)
2018-05-01 16:03:06 +02:00
Torkel Ödegaard
2b93cbbf04 --amend 2018-05-01 14:18:10 +02:00
Torkel Ödegaard
13e015fe3f fix: improved handling of http server shutdown 2018-05-01 14:14:11 +02:00
Mitsuhiro Tanda
253b2cc081 add test for prometheus table column title 2018-05-01 05:00:56 +09:00
David Kaltschmidt
8a53ec610b Fix url encoding, expand template vars, fix TS hacks
* moved datasource related functions to panel sub-class
* expand panel template vars for url
* added keybindings for x -> Explore
* url encoding for explore state
2018-04-30 17:44:30 +02:00
David Kaltschmidt
05b0bfafe4 Explore: Add entry to panel menu to jump to Explore
* panel container menu gets new Explore entry (between Edit and Share)
* entry only shows if datasource has `supportsExplore` set to true (set
 for Prometheus only for now)
* click on Explore entry changes url to `/explore/state` via location provider
* `state` is a JSON representation of the panel queries
* datasources implement `getExploreState()` how to turn a panel config into explore initial
 state
* Explore can parse the state and initialize its query expressions
* ReactContainer now forwards route parameters as props to component
* `pluginlist` and `singlestat` panel subclasses needed to be adapted because
 `panel_ctrl` now has the location provider as a property already
2018-04-30 17:44:28 +02:00
Marcus Efraimsson
0fc4da810f changelog: notes about closing #11498
[skip ci]
2018-04-30 16:33:27 +02:00
Marcus Efraimsson
b0349bc795 Merge pull request #11575 from alexanderzobnin/fix-11498
Histogram: fix invisible highest value bucket
2018-04-30 16:32:21 +02:00
Torkel Ödegaard
fa7d7ed5df Initial Baby Step to refactoring settings from global vars to instance (#11777)
* wip: start on refactoring settings

* settings: progress on settings refactor

* refactor: progress on settings refactoring

* fix: fixed failing test

* settings: moved smtp settings from global to instance
2018-04-30 16:21:04 +02:00
Daniel Lee
fc718b8a9a table: fix for padding
The table-panel-wrapper class got removed when clicking on the panel
menu which resulted in extra padding for the .panel-content div. This
fixes that by setting the table-specific css class lower down in the
html.
2018-04-30 16:17:37 +02:00
Alexander Zobnin
b16626c3b5 graph histogram: fix invisible highest value bucket 2018-04-30 16:12:31 +02:00
Marcus Efraimsson
5c57c7cff5 dashboard: show save as button if can edit and has edit permission to folders 2018-04-30 15:38:46 +02:00
Marcus Efraimsson
770acee56a new property for current user indicating if edit permissions in folders 2018-04-30 15:34:31 +02:00
Marcus Efraimsson
3d9b7a5892 increase length of auth_id column in user_auth table 2018-04-30 14:41:52 +02:00
Marcus Efraimsson
4f7791b9fa fix dropdown typeahead issue
New explore feature overriding css for dropdown typeahead component.
2018-04-30 11:50:50 +02:00
Karsten Weiss
893a91af3a Use opportunities to unindent code (unindent)
This commit fixes the following unindent findings:
pkg/api/common.go:102:2: "if x { if y" should be "if x && y"
pkg/components/dynmap/dynmap.go:642:2: invert condition and early return
pkg/components/dynmap/dynmap.go:681:2: invert condition and early return
pkg/components/simplejson/simplejson.go:171:2: "if x { if y" should be "if x && y"
pkg/middleware/dashboard_redirect.go:42:3: invert condition and early return
pkg/tsdb/mssql/mssql.go:301:3: invert condition and early break
pkg/tsdb/mysql/mysql.go:312:3: invert condition and early break
pkg/tsdb/postgres/postgres.go:292:3: invert condition and early break
pkg/tsdb/sql_engine.go:144:2: invert condition and early return
2018-04-28 10:53:16 +02:00
Carl Bergquist
c5419ba885 Merge pull request #11774 from knweiss/golint
Fix golint warnings
2018-04-28 09:40:56 +02:00
Karsten Weiss
de8696d5d3 Outdent code after if block that ends with return (golint)
This commit fixes the following golint warnings:
pkg/bus/bus.go:64:9: if block ends with a return statement, so drop this else and outdent its block
pkg/bus/bus.go:84:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:137:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:177:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:183:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:199:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:208:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/components/dynmap/dynmap.go:236:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:242:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:257:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:263:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:278:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:284:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:299:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:331:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:350:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:356:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:366:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:390:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:396:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:405:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:427:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:433:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:442:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:459:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:465:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:474:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:491:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:497:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:506:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:523:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:529:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:538:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:555:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:561:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:570:12: if block ends with a return statement, so drop this else and outdent its block
pkg/login/ldap.go:55:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/login/ldap_test.go:372:10: if block ends with a return statement, so drop this else and outdent its block
pkg/middleware/middleware_test.go:213:12: if block ends with a return statement, so drop this else and outdent its block
pkg/plugins/dashboard_importer.go:153:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/dashboards_updater.go:39:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/dashboards_updater.go:121:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/plugins.go:210:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/plugins.go:235:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/eval_context.go:111:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifier.go:92:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifier.go:98:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifier.go:122:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/rule.go:108:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/rule.go:118:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/rule.go:121:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifiers/telegram.go:94:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/annotation.go:34:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/sqlstore/annotation.go:99:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/sqlstore/dashboard_test.go:107:13: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/plugin_setting.go:78:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/preferences.go:91:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/user.go:50:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/migrator/migrator.go:106:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/sqlstore/migrator/postgres_dialect.go:48:10: if block ends with a return statement, so drop this else and outdent its block
pkg/tsdb/time_range.go:59:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/tsdb/time_range.go:67:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/tsdb/cloudwatch/metric_find_query.go:225:9: if block ends with a return statement, so drop this else and outdent its block
pkg/util/filepath.go:68:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
2018-04-27 23:10:43 +02:00
Karsten Weiss
b7adf28501 Remove redundancy in variable declarations (golint)
This commit fixes the following golint warnings:
pkg/api/avatar/avatar.go:229:12: should omit type *http.Client from declaration of var client; it will be inferred from the right-hand side
pkg/login/brute_force_login_protection.go:13:26: should omit type time.Duration from declaration of var loginAttemptsWindow; it will be inferred from the right-hand side
pkg/metrics/graphitebridge/graphite.go:58:26: should omit type []string from declaration of var metricCategoryPrefix; it will be inferred from the right-hand side
pkg/metrics/graphitebridge/graphite.go:69:22: should omit type []string from declaration of var trimMetricPrefix; it will be inferred from the right-hand side
pkg/models/alert.go:37:36: should omit type error from declaration of var ErrCannotChangeStateOnPausedAlert; it will be inferred from the right-hand side
pkg/models/alert.go:38:36: should omit type error from declaration of var ErrRequiresNewState; it will be inferred from the right-hand side
pkg/models/datasource.go:61:28: should omit type map[string]bool from declaration of var knownDatasourcePlugins; it will be inferred from the right-hand side
pkg/plugins/update_checker.go:16:13: should omit type http.Client from declaration of var httpClient; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:103:24: should omit type time.Duration from declaration of var unfinishedWorkTimeout; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:105:19: should omit type time.Duration from declaration of var alertTimeout; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:106:19: should omit type int from declaration of var alertMaxAttempts; it will be inferred from the right-hand side
pkg/services/alerting/notifier.go:143:23: should omit type map[string]*NotifierPlugin from declaration of var notifierFactories; it will be inferred from the right-hand side
pkg/services/alerting/rule.go:136:24: should omit type map[string]ConditionFactory from declaration of var conditionFactories; it will be inferred from the right-hand side
pkg/services/alerting/conditions/evaluator.go:12:15: should omit type []string from declaration of var defaultTypes; it will be inferred from the right-hand side
pkg/services/alerting/conditions/evaluator.go:13:15: should omit type []string from declaration of var rangedTypes; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/opsgenie.go:44:19: should omit type string from declaration of var opsgenieAlertURL; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/pagerduty.go:43:23: should omit type string from declaration of var pagerdutyEventApiUrl; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/telegram.go:21:17: should omit type string from declaration of var telegramApiUrl; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:11:24: should omit type string from declaration of var simpleDashboardConfig; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:12:24: should omit type string from declaration of var oldVersion; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:13:24: should omit type string from declaration of var brokenConfigs; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/file_reader.go:22:30: should omit type time.Duration from declaration of var checkDiskForChangesInterval; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/file_reader.go:24:23: should omit type error from declaration of var ErrFolderNameMissing; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:15:34: should omit type string from declaration of var twoDatasourcesConfig; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:16:34: should omit type string from declaration of var twoDatasourcesConfigPurgeOthers; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:17:34: should omit type string from declaration of var doubleDatasourcesConfig; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:18:34: should omit type string from declaration of var allProperties; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:19:34: should omit type string from declaration of var versionZero; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:20:34: should omit type string from declaration of var brokenYaml; it will be inferred from the right-hand side
pkg/services/sqlstore/stats.go:16:25: should omit type time.Duration from declaration of var activeUserTimeLimit; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/mysql_dialect.go:69:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/mysql_dialect.go:70:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/postgres_dialect.go:95:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/postgres_dialect.go:96:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side
pkg/setting/setting.go:42:15: should omit type string from declaration of var Env; it will be inferred from the right-hand side
pkg/setting/setting.go:161:18: should omit type bool from declaration of var LdapAllowSignup; it will be inferred from the right-hand side
pkg/setting/setting.go:473:30: should omit type bool from declaration of var skipStaticRootValidation; it will be inferred from the right-hand side
pkg/tsdb/interval.go:14:21: should omit type time.Duration from declaration of var defaultMinInterval; it will be inferred from the right-hand side
pkg/tsdb/interval.go:15:21: should omit type time.Duration from declaration of var year; it will be inferred from the right-hand side
pkg/tsdb/interval.go:16:21: should omit type time.Duration from declaration of var day; it will be inferred from the right-hand side
pkg/tsdb/cloudwatch/credentials.go:26:24: should omit type map[string]cache from declaration of var awsCredentialCache; it will be inferred from the right-hand side
pkg/tsdb/influxdb/query.go:15:27: should omit type *regexp.Regexp from declaration of var regexpOperatorPattern; it will be inferred from the right-hand side
pkg/tsdb/influxdb/query.go:16:27: should omit type *regexp.Regexp from declaration of var regexpMeasurementPattern; it will be inferred from the right-hand side
pkg/tsdb/mssql/mssql_test.go:25:14: should omit type string from declaration of var serverIP; it will be inferred from the right-hand side
2018-04-27 22:14:36 +02:00
Torkel Ödegaard
b3531362ca fix: minor fix to plugin service shut down flow 2018-04-27 21:22:29 +02:00
Daniel Lee
7e2fb5e92e appveyor: uppercase the C drive in go path
Fixes #11758
2018-04-27 17:32:53 +02:00
David
cc74f6c6a0 Merge pull request #11761 from grafana/davkal/explore-multi-row
Explore: add support for multiple queries
2018-04-27 17:31:25 +02:00
Leonard Gram
ec23816df6 docs: further documents changes to the docker image. (#11763)
* docs: further documents changes to the docker image.
* docs: explains the changes to user id better.
2018-04-27 17:06:08 +02:00
bergquist
c902ec1808 Merge branch 'notification-service-refactor2'
* notification-service-refactor2:
  fix: removed log calls used while troubleshooting
  refactor: refactoring notification service to use new service registry hooks
2018-04-27 16:59:32 +02:00
Carl Bergquist
2cc855a131 Merge branch 'master' into notification-service-refactor2 2018-04-27 16:59:14 +02:00
bergquist
0cbeb56af1 disable ent build to avoid slowing down build speed 2018-04-27 16:41:07 +02:00
David
d8abfe6a7d Merge pull request #11742 from grafana/davkal/explore
Explore UI skeleton
2018-04-27 15:46:40 +02:00
David Kaltschmidt
949e3d29e8 Explore: add support for multiple queries
* adds +/- buttons to query rows in the Explore section
* on Run Query all query expressions are submitted
* `generateQueryKey` and `ensureQueries` are helpers to ensure each
 query field has a unique key for react.
2018-04-27 15:42:35 +02:00
David Kaltschmidt
25d3ec5bbf Fixed settings default and explore path 2018-04-27 15:35:46 +02:00
Torkel Ödegaard
a8eed9d344 Refactoring PluginManager to be a self registering service (#11755)
* refator: refactored PluginManager to be a self registering service, a lot more work needed to fully make plugin manager use instance variables and not so many globals
2018-04-27 15:11:55 +02:00
Torkel Ödegaard
44b0f15a61 fix: removed log calls used while troubleshooting 2018-04-27 14:28:42 +02:00
Torkel Ödegaard
df71fe33fd refactor: refactoring notification service to use new service registry hooks 2018-04-27 14:15:17 +02:00
Marcus Efraimsson
8f29d28572 Merge pull request #11753 from grafana/11743_unit_revert
revert renaming of unit key ppm
2018-04-27 14:02:57 +02:00
Carl Bergquist
28f7b6dad1 Enable Grafana extensions at build time. (#11752)
* extensions: import and build

* bus: use predefined error

* enterprise: build script for enterprise packages

* poc: auto registering services and dependency injection

(cherry picked from commit b5b1ef875f905473af41e49f8071cb9028edc845)

* poc: backend services registry progress

(cherry picked from commit 97be69725881241bfbf1e7adf0e66801d6b0af3d)

* poc: minor update

(cherry picked from commit 03d7a6888b81403f458b94305792e075568f0794)

* ioc: introduce manuel ioc

* enterprise: adds setting for enterprise

* build: test and build specific ee commit

* cleanup: test testing code

* removes example hello service
2018-04-27 13:41:58 +02:00
Marcus Efraimsson
138c8c348e revert renaming of unit key ppm
#11211 removed the unit key ppm in favor of conppm. A change which is not forward compatible.
This commit revert the unit key back to ppm.
Also adds some better error description if trying to use a unit which don't exists.
Fixes #11743
2018-04-27 13:41:20 +02:00
Mitsuhiro Tanda
c2b720835b fix to match table column name and order 2018-04-27 19:34:10 +09:00
David Kaltschmidt
d338b7ea7b Import and typescript fixups 2018-04-27 11:49:11 +02:00
David Kaltschmidt
1e6e89121c Settings to enable Explore UI 2018-04-27 11:39:14 +02:00
bergquist
afce0feb05 Merge branch 'mjtrangoni-fix-deadcode-issues'
* mjtrangoni-fix-deadcode-issues:
  tech: removes unused code
  add deadcode linter to circleci
  pkg: fix deadcode issues
  build.go: fix deadcode issues
2018-04-27 10:41:56 +02:00
bergquist
8e9b3507c5 tech: removes unused code 2018-04-27 10:39:06 +02:00
bergquist
034f5921cc Merge branch 'fix-deadcode-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-deadcode-issues
* 'fix-deadcode-issues' of https://github.com/mjtrangoni/grafana:
  add deadcode linter to circleci
  pkg: fix deadcode issues
  build.go: fix deadcode issues
2018-04-27 10:31:44 +02:00
David Kaltschmidt
f1220fd2a4 Explore WIP 2018-04-26 20:27:19 +02:00
Mario Trangoni
0459261d19 add deadcode linter to circleci 2018-04-26 19:24:21 +02:00
Mario Trangoni
97fd66db2e pkg: fix deadcode issues 2018-04-26 19:24:21 +02:00
Mario Trangoni
7aaa188471 build.go: fix deadcode issues 2018-04-26 19:04:07 +02:00
Marcus Efraimsson
b53a57610b docs: update current version to 5.1 2018-04-26 18:59:45 +02:00
Marcus Efraimsson
6fa7ffc23f docs: update installation instructions targeting v5.1.0 stable 2018-04-26 18:56:44 +02:00
Marcus Efraimsson
914071993d Merge branch 'docs-5.1' 2018-04-26 18:44:51 +02:00
Daniel Lee
44a61a6db3 changelog: update for v5.1.0 2018-04-26 18:18:54 +02:00
Marcus Efraimsson
28781e7dfd Merge pull request #11736 from grafana/11735_ga
fix so that google analytics script are cached
2018-04-26 16:01:08 +02:00
Marcus Efraimsson
ddeba41638 fix so that google analytics script are cached 2018-04-26 15:49:22 +02:00
Daniel Lee
1dd4f03100 Merge pull request #11726 from grafana/11708_prom_variables
prometheus: variable query should fallback correctly to a series query
2018-04-26 10:29:09 +02:00
Daniel Lee
375816106e Merge pull request #11714 from grafana/11703_mysql_ts_datatypes
sql tsdb: fix value columns conversion to float when using timeseries query
2018-04-25 23:17:22 +02:00
Marcus Efraimsson
fff5d7154e Merge pull request #11721 from grafana/11677-missaligned-menu-carot
fix misalignment of unit and other drop downs in firefox
2018-04-25 17:24:54 +02:00
Daniel Lee
4b73f67703 Merge pull request #11722 from grafana/ie11-panel-edit-height
removed height 100% from panel-container to fix ie11 panel edit mode
2018-04-25 16:26:41 +02:00
Daniel Lee
3000a2a43b Merge pull request #11652 from grafana/davkal/hmr
Add weback-dev-server with hot/hmr support
2018-04-25 15:52:53 +02:00
Marcus Efraimsson
f112e38266 prometheus: convert metric find query tests to jest 2018-04-25 15:37:58 +02:00
Marcus Efraimsson
6687409efb prometheus: fix variable query to fallback correctly to series query
Using a query of for example up or up{job=job1}
2018-04-25 15:37:58 +02:00
Patrick O'Carroll
6836268f3e removed height 100% from panel-container to fix ie11 panel edit mode 2018-04-25 12:44:39 +02:00
Patrick O'Carroll
99aa9a46bc replaced border hack carot with fontawesome carot fixes #11677 2018-04-25 12:16:43 +02:00
Leonard Gram
1290087b78 dev: Mac compatible prometheus block. (#11718) 2018-04-25 11:01:33 +02:00
David
c99d6bd505 Merge pull request #11678 from grafana/davkal/11673-silent-response
Add silent option to backend requests
2018-04-25 09:46:41 +02:00
Carl Bergquist
f2b5b6f299 Merge pull request #11694 from flopp999/patch-5
Added requests/sec(throughput)
2018-04-24 21:30:34 +02:00
Marcus Efraimsson
7626775491 Merge pull request #11695 from grafana/11508_variables_preview_values
allow to show more preview values for variables
2018-04-24 20:05:47 +02:00
Marcus Efraimsson
1452634a2a mssql: fix value columns conversion to float when using timeseries query 2018-04-24 19:54:08 +02:00
Marcus Efraimsson
cf43007531 postgres: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:36 +02:00
Marcus Efraimsson
346577b664 mysql: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:06 +02:00
Marcus Efraimsson
76bd2aea44 sql datasource: extract common logic for converting value column to float 2018-04-24 19:50:14 +02:00
Patrick O'Carroll
a40314022b added pointer to show more, reset values on new query 2018-04-24 17:40:03 +02:00
Marcus Efraimsson
7992897418 docs: add known issues section for mssql documentation
Fixes #11707
2018-04-24 16:30:24 +02:00
David Kaltschmidt
707700ac7d force GET for metadataRequests, w/ test 2018-04-24 16:26:46 +02:00
Marcus Efraimsson
85ccefdb84 Merge branch 'master' into docs-5.1 2018-04-24 16:17:15 +02:00
Marcus Efraimsson
d36efddcf7 Merge pull request #11699 from grafana/11466-edit-row
fixed so user who can edit dashboard can edit row
2018-04-24 14:57:50 +02:00
Carl Bergquist
005556632f Merge pull request #11705 from mjtrangoni/fix-ineffassign-issues
Fix ineffassign issues
2018-04-24 12:56:16 +02:00
David Kaltschmidt
006286ac05 Renamed helperRequest and removed positional args
From review feedback:

* s/helper/metadata
* combined positional args to _request into options dict
* metadataRequest reuses _request()
* moved consumption of this.httpMethod into _request, can be overwritten
 in options due to spread-after
2018-04-24 12:27:37 +02:00
David Kaltschmidt
0695e431ea Move function calls w/ side-effects to componentDidMount
* loadStore() modified the url which triggered a new render path, this
gets noticed by react. Moved to componentDidMount.
2018-04-24 12:07:24 +02:00
Patrick O'Carroll
38a4a2dc60 changed test name and dashboardMock code 2018-04-24 11:22:58 +02:00
Patrick O'Carroll
1446f54447 fixed test 2018-04-24 09:45:53 +02:00
Mario Trangoni
2e927a1053 add ineffassign to circleci gometalinter check 2018-04-23 20:07:31 +02:00
Mario Trangoni
b02a860e66 pkg/components: fix ineffassign issues 2018-04-23 20:03:57 +02:00
Mario Trangoni
15f11effa0 pkg/cmd: fix ineffassign issues 2018-04-23 19:34:55 +02:00
Mario Trangoni
bc570bb140 pkg/log: fix ineffassign issues 2018-04-23 19:31:23 +02:00
Mario Trangoni
6eb00000fe pkg/services: fix ineffassign issues 2018-04-23 19:28:54 +02:00
Patrick O'Carroll
45e6d9fcc4 removed import config 2018-04-23 17:45:51 +02:00
Patrick O'Carroll
3eaaa5d32d fixed so user who can edit dashboard can edit row, fixes #11466 2018-04-23 17:44:29 +02:00
Leonard Gram
3a48ea8dde Fixes signing of packages.
Signing was failing as the builds
were expected to run as ubuntu but
is run as root.

Closes #11686
2018-04-23 17:05:32 +02:00
Dan Cech
affd3d15a0 Merge pull request #11150 from sbskas/master
Make Ldap group composed of  DNs work.
2018-04-23 10:49:45 -04:00
Marcus Efraimsson
d14ac54af6 db: fix failing user auth tests for postgres 2018-04-23 16:02:59 +02:00
Daniel Lee
1dea5cb34b Merge pull request #11683 from marefr/11668_default_permissions
Fix for default permissions on folder are not shown as inherited in it's dashboards
2018-04-23 14:58:22 +02:00
flopp999
28ce71253f changed rps to reqps 2018-04-23 14:06:25 +02:00
bergquist
3cca45dd88 bump version 2018-04-23 13:59:52 +02:00
Patrick O'Carroll
c2cc77fa08 added button to show more preview values for variables, button runs a function that increases options limit, fixes #11508 2018-04-23 13:00:24 +02:00
flopp999
1cc4c0c1f0 Added requests/sec(throughput)
#9630
2018-04-23 12:05:26 +02:00
Marcus Efraimsson
079346917f use inherited property from api when rendering permissions 2018-04-23 09:23:31 +02:00
Marcus Efraimsson
d86ed679b1 return inherited property for permissions 2018-04-23 09:23:14 +02:00
Carl Bergquist
6315142d00 Merge pull request #11689 from mjtrangoni/fix-ineffassign-issues
pkg/tsdb: fix ineffassign isues
2018-04-23 07:57:55 +02:00
Carl Bergquist
7e089314f7 Merge pull request #11688 from mjtrangoni/fix-gometalinter-circleci
fix CircleCI gometalinter test
2018-04-23 07:54:21 +02:00
Andrzej Ressel
9d5ccaef54 Merge branch 'master' into feature/save_json 2018-04-22 21:24:52 +02:00
Mario Trangoni
556219b192 pkg/tsdb: fix ineffassign isues 2018-04-22 20:51:58 +02:00
Mario Trangoni
fd20aa7c03 fix circleci gometalinter test 2018-04-22 16:22:29 +02:00
Daniel Lee
6b5854936d Merge pull request #11502 from marefr/graphite_ds_test
graphite: use a query when testing data source
2018-04-22 11:31:51 +02:00
Daniel Lee
b5a54c535b Merge pull request #11654 from svenklemm/postgres-docs-timefilter
postgres: adjust timeFilter, timeFrom and timeTo macro examples
2018-04-22 11:16:15 +02:00
Sven Klemm
eb994ad72e Merge remote-tracking branch 'upstream/master' into postgres-docs-timefilter 2018-04-21 18:31:45 +02:00
Jonathan McCall
069012639a Sort results from GetDashboardTags 2018-04-20 12:17:17 -04:00
Daniel Lee
3451f9a9db Merge branch 'annotations-created' of https://github.com/ryantxu/grafana into ryantxu-annotations-created 2018-04-20 17:14:06 +02:00
David Kaltschmidt
53817b7429 Add silent option to backend requests
* When set to `true`, the `silent` option for backend_srv requests
 suppresses all event emitters that are triggered when the response is
received.
* Added `helperRequest()` to the Prometheus datasource to support
 requests that are not triggered by the user, e.g., for tab completion.
`helperRequest()` sets the `silent` option.
* Migrated all non-timeseries queries of the Prometheus datasource to
 use `helperRequest()`.

Fixes #11673
2018-04-20 15:28:04 +02:00
Daniel Lee
8f9d9ed35d docs: escape asterisk in Graphite docs 2018-04-20 15:27:20 +02:00
Daniel Lee
f4f12c1e84 Merge remote-tracking branch 'upstream/master' into docs-5.1 2018-04-20 15:15:42 +02:00
Daniel Lee
bde0136317 Merge pull request #11671 from grafana/docs-variable-interpolation-mssql
Docs for mssql for #11642
2018-04-20 15:09:20 +02:00
Daniel Lee
2b3c547589 Merge pull request #11642 from grafana/docs-variable-interpolation
Docs variable interpolation
2018-04-20 15:09:05 +02:00
Daniel Lee
ba2e43f547 docs: disable quoting option for MSSQL 2018-04-20 13:36:07 +02:00
Daniel Lee
492f842c53 docs: fix example for graphite tag query
Was missing a tilde in the tag_values example
2018-04-20 13:32:17 +02:00
Daniel Lee
3a99148315 docs: spelling 2018-04-20 13:24:37 +02:00
bergquist
e168bfe03e docs: release 5.1.0-beta1 2018-04-20 13:23:45 +02:00
Daniel Lee
71dcafebb8 docs: add missing backtick for mysql/postgres 2018-04-20 13:22:43 +02:00
Daniel Lee
c10359dd5b docs: fixes for table in variable docs 2018-04-20 13:21:14 +02:00
bergquist
177220e2fe build: fixes release deploy 2018-04-20 12:59:44 +02:00
bergquist
d7f58d74d3 changelog: adds releaste date for 5.1.0-beta1 2018-04-20 11:16:24 +02:00
Daniel Lee
cdbd4e0fc0 graphite: convert ds test to jest 2018-04-20 11:09:52 +02:00
Daniel Lee
c2064781a0 Merge pull request #11640 from grafana/11637-dropdown-styling
removed padding and moved carrot
2018-04-20 11:05:40 +02:00
Dan Cech
7cc3d0c34e Merge branch 'master' into master 2018-04-19 12:01:48 -04:00
Sven Klemm
5076f9304b slightly better example 2018-04-19 17:01:48 +02:00
Sven Klemm
048cecdab5 adjust timeFilter, timeFrom and timeTo macro examples 2018-04-19 16:56:58 +02:00
Marcus Efraimsson
9fc59cc212 Merge pull request #11644 from grafana/11392_whats_new_v51
docs: What's new in v5.1
2018-04-19 16:37:04 +02:00
Marcus Efraimsson
727a7bf27a docs: what's new improvements 2018-04-19 16:26:42 +02:00
Marcus Efraimsson
886c8b823a docs: what's new improvements 2018-04-19 14:51:33 +02:00
bergquist
b5820d930c Merge branch 'master' into 11392_whats_new_v51
* master:
  build: only lint the pkg folder
  changelog: adds note about closing #11476
  singlestat: Fix optimization in setTableColumnToSensibleDefault
  influxdb: Check before assuming first column to be 'time'
2018-04-19 14:27:13 +02:00
bergquist
ffb1db833c docs: what's new
add's info about new template variable interpolation
2018-04-19 14:23:47 +02:00
Marcus Efraimsson
540bde269e docs: fix typos 2018-04-19 13:49:40 +02:00
Marcus Efraimsson
cc3418f6a3 docs: what's new
Improved scrolling experience
2018-04-19 13:44:37 +02:00
bergquist
b4a77d49b4 docs: whats new
reduce content a little bit and highlight mssql and prom heatmap
2018-04-19 13:39:02 +02:00
bergquist
601a1d9b92 docs: more info prometheus heapmap to whats new 2018-04-19 13:33:50 +02:00
Marcus Efraimsson
6737f79331 docs: improve what's new in v5.1 2018-04-19 13:25:16 +02:00
Marcus Efraimsson
250f85b9bd docs: what's new in v5.1 draft 2018-04-19 12:54:10 +02:00
David Kaltschmidt
cc5d7002b0 Add weback-dev-server with hot/hmr support
* adds `npm start` / `yarn start` script
* starts a webpack-dev-server using the dev config, served on :3333
* hot reloading (HMR) for react/styles, not working for angular code
* new entry `dev.ts` for dynamic imports of CSS theme (ExtractText does
not work with HMR)
* TS loader pipeline moved out of common to add HMR for react
* applied `hot()` to some react containers (that's their new default
 export, named exports remains for testing)
* added sections to README
* updated yarn.lock
2018-04-19 11:42:53 +02:00
Marcus Efraimsson
ba9c3f60c4 Merge branch 'master' into docs-5.1 2018-04-19 10:52:17 +02:00
Marcus Efraimsson
cec9634f4a fix typo 2018-04-18 14:52:36 +02:00
Daniel Lee
ab4f8c273d docs: describes variable formatting options
csv option in postgres/mysql docs and the regex option in the
graphite docs
2018-04-18 14:40:34 +02:00
Daniel Lee
120a86ecf9 docs: graphite template variables for tag queries
ref #11388 and ref #9911 and ref #10366
2018-04-18 14:40:34 +02:00
Daniel Lee
24ae9cef36 docs: describes new variable formatting syntax
Fixes #11388
Ref #11141
2018-04-18 14:40:34 +02:00
Marcus Efraimsson
7e8bd8d004 Merge branch 'master' into docs-5.1 2018-04-18 14:39:38 +02:00
Patrick O'Carroll
e794951087 removed padding and moved carrot 2018-04-18 10:21:48 +02:00
Marcus Efraimsson
d30835f648 docs: update provisioning documentation
In addition to closing #10883
2018-04-17 17:22:25 +02:00
Marcus Efraimsson
b142d6a037 Merge branch 'master' into docs-5.1 2018-04-17 16:50:26 +02:00
Marcus Efraimsson
ad22e20ecd docs: update postgres macro functions documentation
In addition to closing #11578
2018-04-17 00:06:25 +02:00
Marcus Efraimsson
979f2d79fb Merge branch 'master' into docs-5.1 2018-04-16 23:58:50 +02:00
Leonard Gram
abed9c055f docs: new docker image in Grafana 5.1.0. 2018-04-16 15:33:15 +02:00
Marcus Efraimsson
c9f5568332 Merge branch 'master' into docs-5.1 2018-04-16 14:35:43 +02:00
Marcus Efraimsson
92ac1fbb5b Merge branch 'master' into docs-5.1 2018-04-16 09:58:46 +02:00
Sven Klemm
1c0a188272 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-13 22:18:32 +02:00
Marcus Efraimsson
48143d6caf Merge branch 'master' into docs-5.1 2018-04-13 16:40:38 +02:00
Marcus Efraimsson
9c492bd774 docs: add mssql provisioning example 2018-04-13 15:53:45 +02:00
Marcus Efraimsson
428d4b0dbf Merge branch 'master' into docs-5.1 2018-04-13 15:44:53 +02:00
Marcus Efraimsson
f2c5417ee4 Merge branch 'master' into docs-5.1 2018-04-13 11:36:54 +02:00
Marcus Efraimsson
aa59843902 docs: update mssql with azure sql database support 2018-04-13 11:36:40 +02:00
Marcus Efraimsson
fa95297e6a docs: update default annotation limit when querying api
Needed due to closing #11569
2018-04-13 10:58:29 +02:00
Marcus Efraimsson
80e4a9dc55 Merge branch 'master' into docs-5.1 2018-04-13 10:56:26 +02:00
Andrzej Ressel
bff174dba9 PR comments 2018-04-11 22:59:29 +02:00
Marcus Efraimsson
1232745e89 docs: fix typo of default port for mssql
Fixes #11562
2018-04-11 20:56:16 +02:00
Marcus Efraimsson
fe4cfbeb73 Merge branch 'master' into docs-5.1 2018-04-11 20:38:09 +02:00
Sven Klemm
24eafa4537 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-10 14:37:11 +02:00
Daniel Lee
d39dac10a6 docs: update after #11531 2018-04-09 15:19:41 +02:00
ryan
5ca972542b convert graphite epoch to ms 2018-04-09 13:58:09 +02:00
ryan
56679ac80f Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master:
  prevent angular from evaluating {{hostname}} in tooltip (#11514)
2018-04-09 13:52:54 +02:00
ryan
60816f5fc2 using millis for annotations too 2018-04-09 12:48:01 +02:00
ryan
39f37ff8aa Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master:
  docs: updated debian distro in install docs to stretch, closes #11527
  css: quick fix after IE11 changes
  fixed sidemenu icon issue created by earlier pr
  changelog: adds note for #11165
  migrated dash_class to ts
  migrated segment_srv to ts
  removed indent for manage dashboards
  created closeDropdown function, renamed appevent, added second appevent for open timepicker
  added if to onAppevent, renamed appevent, add appevent to applyCustom and setRelativeFilter
  docker: add users and groups to ldap block
  timepicker now closes without exiting edit/view mode, close order: modal, timepicker, view
  bounnd the esc key to exit timepicker
  added indent to dashboards inside folder in search dropdown, and added indent to dashboard icon in search item
2018-04-09 12:31:44 +02:00
Aleksei Magusev
92e5968f91 Fix ResponseParser for InfluxDB to return only string values 2018-04-09 11:52:12 +02:00
Aleksei Magusev
a101177b55 Conditionally select a field to return in ResponseParser for InfluxDB
This patch also fixes "value[1] || value[0]" to not ignore zeros.
2018-04-09 11:51:22 +02:00
Penghan Wang
fbed72c89c Merge branch 'master' into feature/add_es_alerting 2018-04-09 14:00:28 +08:00
Andrzej Ressel
c4b57a2562 Revert files 2018-04-08 20:40:09 +02:00
Andrzej Ressel
cfd1f5c072 Revert files 2018-04-08 20:38:08 +02:00
Andrzej Ressel
697a3eaa43 Fix after merge 2018-04-08 20:31:17 +02:00
Andrzej Ressel
30f048965c Merge branch 'master' into feature/discord 2018-04-08 20:09:56 +02:00
Andrzej Ressel
dc11f1da81 Make dashboard JSON editable 2018-04-08 20:00:18 +02:00
Sven Klemm
107c0d81d2 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-06 17:01:45 +02:00
Marcus Efraimsson
4cc80efee6 graphite: use a query when testing data source
Using a query (POST /render) request instead of GET /metrics/find to better
mimic an actual request for rendering a panel in a dashboard. The POST /render
request will add at least a custom http header which can be problematic when
using direct access mode since it will trigger a CORS prerequest check. By
doing this kind of query when testing the data source possible CORS issues
can be detected there instead of later when trying to use the data source
in a dashboard.
2018-04-05 18:11:35 +02:00
ryan
66d020eb7e skip migration if it is a big number 2018-04-05 09:51:08 +02:00
ryan
392c47f39b Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master: (51 commits)
  Use curly brackets around hyperlink help text #11478 (#11479)
  migrated playlist-routes to ts
  migrated last all.js to ts
  Notes for closing #7119
  changelog: adds note for #11128
  variables: adds test for variable sorting
  Add case-insensitive sort for variables.
  graphite: fixes #11434
  settings: fixes test
  changed from margin to padding
  changed variable for tabbed close btn hover, and changed text-strong variable for lighttheme, removed commented out variable
  mssql: typos in help sections
  Webpack Grafana plugin template project to links (#11457)
  rm panel.type  constrain from threshold_mapper.ts (#11448)
  No need for node_modules/bin in npm run-script (#11449)
  changelog: adds note about closing #11555
  add article
  fix some typos
  migrated graph_tooltip to ts
  started migration to ts
  ...
2018-04-05 09:48:00 +02:00
Marcel Anacker
64c16eb912 Alerting: Fixing mobile notifications in Microsoft Teams 2018-04-04 16:28:12 +02:00
Daniel Lee
51b078fb65 docs: spelling 2018-04-03 09:47:53 +02:00
Sven Klemm
fa170b3cc6 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-28 20:43:15 +02:00
wph95
4050fce220 add response_parser test 2018-03-28 12:35:05 +08:00
Marcus Efraimsson
828dd34507 docs: update table plugin documentation with value/range to text mapping 2018-03-27 20:18:04 +02:00
wph95
06f7332156 cleanup and add more test 2018-03-28 01:42:25 +08:00
Marcus Efraimsson
c9cdb4cda0 Merge pull request #11383 from alexanderzobnin/docs-10009
Update heatmap and prometheus docs
2018-03-27 14:01:36 +02:00
Marcus Efraimsson
41ff37f0a1 Merge branch 'master' into docs-5.1 2018-03-27 14:00:16 +02:00
Alexander Zobnin
2c7040c246 docs: prometheus ds, remove "new in v4.3" note 2018-03-27 09:48:19 +03:00
Sven Klemm
8b3c308168 remove categories from queryPart 2018-03-26 20:15:16 +02:00
wph95
4042e4b225 fix a terms bug and add test 2018-03-27 02:12:43 +08:00
Sven Klemm
d6ac7aee89 remove unused import 2018-03-26 18:50:03 +02:00
Sven Klemm
6c2ef7dca6 handle aggregate functions more generic 2018-03-26 18:34:40 +02:00
Alexander Zobnin
b97cede054 docs: update heatmap and prometheus docs, #10009 2018-03-26 17:12:25 +03:00
Penghan Wang
a21afbe9a6 Merge branch 'master' into feature/add_es_alerting 2018-03-26 19:51:03 +08:00
wph95
63a200686e - pipeline aggs support
- add some test
2018-03-26 19:48:57 +08:00
Sven Klemm
12600a0e95 support non-nested menu entries 2018-03-26 13:19:14 +02:00
wph95
d6cdc2497c Handle Interval Date Format similar to the JS variant
7e14e272fa
2018-03-26 16:13:14 +08:00
wph95
1e275d0cd1 set right series name
Signed-off-by: wph95 <wph657856467@gmail.com>
2018-03-25 02:18:28 +08:00
ryan
71ef9b6db5 Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master: (26 commits)
  notes about closing #11306
  cleanup
  changelog: unix socket permissions
  Adjust permissions of unix socket
  docs: tweaks
  changelog: adds note about closing #5855
  legend: small refactoring
  Make golint happier
  mysql: skip tests by default
  mssql: update query editor help
  mysql: fix precision for the time column in table/annotation query mode
  postgres: fix precision for the time column in table/annotation query mode
  mssql: fix precision for the time column in table/annotation query mode
  mssql: remove UTC conversion in macro functions
  mssql: fix timeGroup macro so that it properly creates correct groups
  small screen legend right also work like legend under in render + set scrollbar to undefined in destroyScrollbar so it doesnt become disabled when toggeling between right and under
  fixed so legend right works like legend under on small screens
  Alerting: move getNewState to EvalContext
  graphite: adds more traces for alerting
  sql datasource: extract common logic for converting time column to epoch time in ms
  ...
2018-03-24 11:39:35 +01:00
ryan
eabcbcda88 remove README changes 2018-03-24 11:39:20 +01:00
wph95
bc5b59737c finished CODING PHASE 1
Signed-off-by: wph95 <wph657856467@gmail.com>
2018-03-24 13:06:21 +08:00
wph95
8e7d23cdeb wip
Signed-off-by: wph95 <wph657856467@gmail.com>
2018-03-23 23:50:16 +08:00
Patrick O'Carroll
bd7964d549 Merge pull request #11367 from grafana/graph_51_docs
Update graph panel documentation
2018-03-23 16:21:39 +01:00
Penghan Wang
fa72c4fea4 Merge pull request #1 from grafana/master
upgrade from grafana/grafana
2018-03-23 23:18:27 +08:00
Marcus Efraimsson
13d0bd5815 Merge branch 'docs-5.1' into graph_51_docs 2018-03-23 15:51:32 +01:00
Marcus Efraimsson
0a487c484d docs: fix typos 2018-03-23 15:49:54 +01:00
Marcus Efraimsson
403c64ab20 docs: update postgres, mysql and mssql documentation
Due to changes closing #11306
2018-03-23 15:48:04 +01:00
Marcus Efraimsson
c318f7bb31 Merge branch 'master' into docs-5.1 2018-03-23 15:15:57 +01:00
Marcus Efraimsson
1b8103f0ea docs: update graph panel documentation
Added new versions of images and new images to better highlight the possible
configuration options.
Documentation was very outdated so tried to fix that to better reflect the
current state/latest release.
2018-03-23 14:43:57 +01:00
ryan
7defb1adf5 remove dashboardId check... i can't figure out how the tests work 2018-03-23 12:54:53 +01:00
ryan
e92ea79524 get circle to run tests again 2018-03-23 12:48:03 +01:00
ryan
2116152295 add dashboardId to test 2018-03-23 12:35:39 +01:00
ryan
a58b4ff2d6 remove api tests 2018-03-23 12:13:38 +01:00
ryan
14b737e662 update CHANGELOG 2018-03-23 12:08:32 +01:00
ryan
b39fb7fdd5 fix operator 2018-03-23 12:01:21 +01:00
ryan
a0a6fa6fa5 remove constraint from sqlstore 2018-03-23 11:47:07 +01:00
ryan
a5588b6957 Merge remote-tracking branch 'origin/annotations-created' into annotations-created
* origin/annotations-created:
  dooh
2018-03-23 11:44:21 +01:00
ryan
4ed1ec5174 Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master: (30 commits)
  changelog: adds note about closing #11278
  docs: spelling
  docs: add intro paragraph to provisioning page
  Cleanup CircleCI V2 Conversion
  changelog: notes for #1271 and #2740
  graph: minor fixes to y-axes alignment feature
  added save icon to save buttons
  removed trash can icon from save buttons
  Return actual user ID in UserProfileDTO
  dashboard version cleanup: more tests and refactor
  minor refactor of dashboard version cleanup
  refactor: dashboard version cleanup
  limit number of rows deleted by dashboard version cleanup
  fix dashboard version cleanup on large datasets
  Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
  Fixed unit test.
  Changed the way this feature was activated. And changed tolltip.
  Added validation of input parameters.
  Resolved conflict
  Corrected work for graphs created before this feature.
  ...
2018-03-23 11:38:43 +01:00
ryan
db92a96067 move dashboard error to API (not sql) 2018-03-23 11:36:44 +01:00
Marcus Efraimsson
1d515bb52c Merge branch 'master' into docs-5.1 2018-03-23 10:40:12 +01:00
Ryan McKinley
164ddb16c9 dooh 2018-03-22 20:48:40 +01:00
ryan
0c7294593c update the updated column! 2018-03-22 20:05:04 +01:00
ryan
d554c6f9be using circle as my tester 2018-03-22 19:44:47 +01:00
ryan
fa021b547a using circle as my tester 2018-03-22 19:39:30 +01:00
ryan
db91033b6e adding tests, but they arent running locally 2018-03-22 19:33:33 +01:00
ryan
20353db966 convert epoch to milliseconds 2018-03-22 16:21:47 +01:00
ryan
a2bbd89a9e adding updated column 2018-03-22 15:52:09 +01:00
ryan
df94b380f4 Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master:
  Make golint happier
2018-03-22 14:59:14 +01:00
ryan
3898ea02e6 adding created column 2018-03-22 02:22:58 +01:00
Daniel Lee
fe293718a2 Merge pull request #11310 from grafana/mssql_datasource_docs
docs: Using Microsoft SQL Server in Grafana
2018-03-20 20:39:52 +01:00
Daniel Lee
e5df179c7c docs: spelling 2018-03-20 20:38:20 +01:00
Marcus Efraimsson
74c3f732c1 docs: update using mssql in grafana 2018-03-20 10:59:35 +01:00
Sven Klemm
95a5a61337 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-19 20:23:36 +01:00
Marcus Efraimsson
1f8a2a67bf docs: Using Microsoft SQL Server in Grafana 2018-03-19 11:06:10 +01:00
Sven Klemm
8392fe5cd2 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-17 16:24:06 +01:00
Sven Klemm
f4006911e0 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-14 23:13:53 +01:00
Sven Klemm
46c229188e read aggregate functions from database 2018-03-14 23:03:32 +01:00
Sven Klemm
0c3afd0e9c add buildAggregateQuery 2018-03-14 22:59:48 +01:00
Sven Klemm
64fa1ce8a0 properly handle IN queries 2018-03-14 18:09:47 +01:00
Sven Klemm
6793fa5e54 join multivalue variables with , 2018-03-13 23:33:40 +01:00
Sven Klemm
e6501f0f0e revert special handling for IN 2018-03-13 23:24:26 +01:00
Sven Klemm
5e9a66de5f put values for IN in parens 2018-03-13 23:19:56 +01:00
Sven Klemm
958646d976 dont quote where constraints 2018-03-13 23:15:25 +01:00
Sven Klemm
b7c7030a46 add regex operators 2018-03-13 23:06:39 +01:00
flopp999
08461408a2 Added Kilopascals(kPa) under pressure 2018-03-13 22:17:56 +01:00
flopp999
af63a26be0 Added W/m2(energy) and l/h(flow)
both as .fixedUnit
2018-03-13 22:11:58 +01:00
Sven Klemm
046ee8efd8 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-13 21:31:43 +01:00
Sven Klemm
cdb4e2ba0b remove unused setting 2018-03-13 21:31:07 +01:00
Sven Klemm
e780b1bce5 cleanup where segment handling 2018-03-11 12:06:54 +01:00
Sven Klemm
0b358ff5f3 remove limit 2018-03-10 22:39:42 +01:00
Sven Klemm
cb5278d413 handle variables in where constraints 2018-03-10 20:18:03 +01:00
Sven Klemm
1d8540ac69 properly quote where constraint parts 2018-03-09 18:18:12 +01:00
Sven Klemm
340f679d0f quote schema and table 2018-03-09 18:09:59 +01:00
Sven Klemm
1849e938bd Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-09 17:30:01 +01:00
Dan Cech
abef722265 Fix indent 2018-03-07 14:41:05 -05:00
Sven Klemm
e590068082 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-07 18:38:28 +01:00
Sébastien BERNARD
380aa26ea3 Fix the code to match the documentation.
Permit for LDAP groups to be groupofuniquenames composed of uniquename (DN).
For this, propose DN as group_search_filter_user_attribute and DN also for the member_of in the server.attributes section.

DN is processed as a special attribute name which returns the LdapSearchResult.DN field instead of a member of attr array.
2018-03-07 18:14:18 +01:00
Sven Klemm
6b656094fc Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-06 10:43:01 +01:00
Daniel Lee
0e54c474aa Merge branch 'master' into docs-5.1 2018-03-06 09:28:13 +01:00
Daniel Lee
8a1bd2ee22 docs: fill for mysql/postgres
ref #10138
2018-03-06 09:24:36 +01:00
Sven Klemm
83200c289a use metricColumn in query builder 2018-03-04 23:32:23 +01:00
Sven Klemm
6766028d7a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-04 21:40:20 +01:00
Sven Klemm
bf4a30d30f set rawSQL when rendering query builder query 2018-03-04 19:46:11 +01:00
Sven Klemm
26e09b598c fix group by column 2018-03-04 19:35:43 +01:00
Sven Klemm
e8c6341fed clean up aggregation functions 2018-03-04 10:18:11 +01:00
Sven Klemm
7104e6f9f8 fix variable interpolation 2018-03-03 22:11:51 +01:00
Sven Klemm
fd518846b1 rename field to column 2018-03-03 20:57:00 +01:00
Sven Klemm
1a051ce320 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-01 14:40:43 +01:00
Sven Klemm
6c6be9cfc0 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-26 07:50:49 +01:00
Sven Klemm
c5de5ed5be Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-21 08:24:04 +01:00
Martin Molnar
be2fa54459 feat(ldap): Allow use of DN in user attribute filter (#3132) 2018-02-20 11:15:31 +01:00
Sven Klemm
dd2b6c70a2 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-08 16:48:12 +01:00
Sven Klemm
ef18eb7fcb add where constraint handling 2018-02-08 10:25:32 +01:00
Sven Klemm
3bce45d8a6 add query_builder 2018-02-08 10:19:43 +01:00
Sven Klemm
bb68cb6e3c Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-07 20:12:51 +01:00
Sven Klemm
09efcbc205 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-07 15:01:00 +01:00
Sven Klemm
382a525477 make metricColumn functional 2018-02-03 18:26:57 +01:00
Sven Klemm
01a1737ddb Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-03 18:06:01 +01:00
Sven Klemm
c65a964cdd add metric column selector 2018-02-03 18:03:00 +01:00
Sven Klemm
4dbd83fac1 add groupby to querybuilder
remove unused aggregations
2018-01-31 15:32:32 +01:00
Sven Klemm
571ecdc740 enhance render function 2018-01-30 22:57:38 +01:00
Sven Klemm
443504517a add postgres_query.ts 2018-01-30 22:13:55 +01:00
Sven Klemm
438b10bcd6 query builder changes 2018-01-30 14:10:38 +01:00
Sven Klemm
a59e052a0f more query builder components 2018-01-30 14:08:10 +01:00
Sven Klemm
17be31e216 call render in query 2018-01-28 22:16:51 +01:00
Sven Klemm
33ac22bfdb start query builder ui 2018-01-21 22:08:18 +01:00
Craig Miskell
2e86985d44 Remove silly noise 2018-01-05 16:22:49 +13:00
Craig Miskell
f9fb315dbd Update tests to match new reality, and rejig the implementation a bit to truly work as desired 2018-01-05 16:20:54 +13:00
Craig Miskell
61e6f63b32 Align queries to prometheus with the step to ensure 'rate' type expressions get consistent results 2018-01-05 09:08:40 +13:00
Daniel Lee
3a3272e225 annotations: allows template variables to be used in tag filter
When filtering built in annotations by tag, interpolates the tag with
template variables. Fixes #9587
2017-12-12 10:07:33 +01:00
Jeroen Jacobs
5b926cc102 Adding a user in a specified organisation uses the admin API 2017-11-17 12:19:18 +01:00
Andrzej Ressel
1bf982439b Sending image 2017-03-23 21:53:54 +01:00
Andrzej Ressel
5f3b7eaa45 Discord integration 2017-03-22 23:28:55 +01:00
1939 changed files with 127638 additions and 56764 deletions

View File

@@ -9,7 +9,7 @@ watch_dirs = [
"$WORKDIR/public/views",
"$WORKDIR/conf",
]
watch_exts = [".go", ".ini", ".toml"]
watch_exts = [".go", ".ini", ".toml", ".template.html"]
build_delay = 1500
cmds = [
["go", "run", "build.go", "-dev", "build-server"],

View File

@@ -1,6 +1,61 @@
aliases:
# Workflow filters
- &filter-only-release
branches:
ignore: /.*/
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
- &filter-not-release-or-master
tags:
ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
ignore: master
- &filter-only-master
branches:
only: master
version: 2
jobs:
mysql-integration-test:
docker:
- image: circleci/golang:1.11
- image: circleci/mysql:5.6-ram
environment:
MYSQL_ROOT_PASSWORD: rootpass
MYSQL_DATABASE: grafana_tests
MYSQL_USER: grafana
MYSQL_PASSWORD: password
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run: sudo apt update
- run: sudo apt install -y mysql-client
- run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
- 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/... '
postgres-integration-test:
docker:
- image: circleci/golang:1.11
- image: circleci/postgres:9.3-ram
environment:
POSTGRES_USER: grafanatest
POSTGRES_PASSWORD: grafanatest
POSTGRES_DB: grafanatest
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run: sudo apt update
- run: sudo apt install -y postgresql-client
- run: dockerize -wait tcp://127.0.0.1:5432 -timeout 120s
- 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/...'
codespell:
docker:
- image: circleci/python
@@ -19,34 +74,38 @@ jobs:
gometalinter:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11
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: install gometalinter tool
command: 'go get -u github.com/alecthomas/gometalinter'
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: install linters
command: 'gometalinter --install'
- run:
name: run some linters
command: 'gometalinter --vendor --deadline 6m --disable-all --enable=structcheck --enable=unconvert --enable=varcheck ./pkg/...'
name: run go vet
command: 'go vet ./pkg/...'
test-frontend:
docker:
- image: circleci/node:6.11.4
- image: circleci/node:8
steps:
- checkout
- run:
name: install yarn
command: 'sudo npm install -g yarn --quiet'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
# Could we skip this step if the cache has been restored? `[ -d node_modules ] || yarn install ...` should be able to apply to build step as well
- run:
name: yarn install
command: 'yarn install --pure-lockfile --no-progress'
no_output_timeout: 15m
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
@@ -57,7 +116,7 @@ jobs:
test-backend:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -65,12 +124,63 @@ jobs:
name: build backend and run go tests
command: './scripts/circle-test-backend.sh'
build:
build-all:
docker:
- image: grafana/build-container:v0.1
- image: grafana/build-container:1.1.0
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.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: build and package grafana
command: './scripts/build/build-all.sh'
- 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: Build Grafana.com master publisher
command: 'go build -o scripts/publish scripts/build/publish.go'
- run:
name: Build Grafana.com release publisher
command: 'cd scripts/build/release_publisher && go build -o release_publisher .'
- persist_to_workspace:
root: .
paths:
- dist/grafana*
- scripts/*.sh
- scripts/publish
- scripts/build/release_publisher/release_publisher
- scripts/build/publish.sh
build:
docker:
- image: grafana/build-container:1.1.0
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: build and package grafana
command: './scripts/build/build.sh'
@@ -80,15 +190,82 @@ jobs:
- run:
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'
- persist_to_workspace:
root: .
paths:
- dist/grafana*
- scripts/*.sh
- scripts/publish
grafana-docker-master:
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
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: build, test and package grafana enterprise
command: './scripts/build/build_enterprise.sh'
- run:
name: sign packages
command: './scripts/build/sign_packages.sh'
- 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/grafana-enterprise*
deploy-enterprise-master:
docker:
- image: circleci/python:2.7-stretch
steps:
- attach_workspace:
at: .
- run:
name: install awscli
command: 'sudo pip install awscli'
- run:
name: deploy to s3
command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/master'
deploy-master:
docker:
@@ -101,23 +278,25 @@ jobs:
command: 'sudo pip install awscli'
- run:
name: deploy to s3
command: 'aws s3 sync ./dist s3://$BUCKET_NAME/master'
command: |
# Also
cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
aws s3 sync ./dist s3://$BUCKET_NAME/master
- run:
name: Trigger Windows build
command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
- run:
name: Trigger Docker build
command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}'
- run:
name: Publish to Grafana.com
command: './scripts/publish -apiKey ${GRAFANA_COM_API_KEY}'
command: |
rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
./scripts/publish -apiKey ${GRAFANA_COM_API_KEY}
deploy-release:
docker:
- image: circleci/python:2.7-stretch
steps:
- attach_workspace:
at: dist
at: .
- run:
name: install awscli
command: 'sudo pip install awscli'
@@ -125,47 +304,121 @@ jobs:
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'
- run:
name: Trigger Docker build
command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} ${CIRCLE_TAG}'
name: Deploy to Grafana.com
command: './scripts/build/publish.sh'
workflows:
version: 2
test-and-build:
build-master:
jobs:
- build-all:
filters: *filter-only-master
- build-enterprise:
filters: *filter-only-master
- codespell:
filters:
tags:
only: /.*/
- build:
filters:
tags:
only: /.*/
filters: *filter-only-master
- gometalinter:
filters: *filter-only-master
- test-frontend:
filters:
tags:
only: /.*/
filters: *filter-only-master
- test-backend:
filters:
tags:
only: /.*/
filters: *filter-only-master
- mysql-integration-test:
filters: *filter-only-master
- postgres-integration-test:
filters: *filter-only-master
- deploy-master:
requires:
- build-all
- test-backend
- test-frontend
- build
filters:
branches:
only: master
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-master
- grafana-docker-master:
requires:
- build-all
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-master
- deploy-enterprise-master:
requires:
- build-all
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
- build-enterprise
filters: *filter-only-master
release:
jobs:
- build-all:
filters: *filter-only-release
- codespell:
filters: *filter-only-release
- gometalinter:
filters: *filter-only-release
- test-frontend:
filters: *filter-only-release
- test-backend:
filters: *filter-only-release
- mysql-integration-test:
filters: *filter-only-release
- postgres-integration-test:
filters: *filter-only-release
- deploy-release:
requires:
- build-all
- test-backend
- test-frontend
- build
filters:
branches:
ignore: /.*/
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
- grafana-docker-release:
requires:
- build-all
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
build-branches-and-prs:
jobs:
- build:
filters: *filter-not-release-or-master
- codespell:
filters: *filter-not-release-or-master
- gometalinter:
filters: *filter-not-release-or-master
- test-frontend:
filters: *filter-not-release-or-master
- test-backend:
filters: *filter-not-release-or-master
- mysql-integration-test:
filters: *filter-not-release-or-master
- postgres-integration-test:
filters: *filter-not-release-or-master
- grafana-docker-pr:
requires:
- build
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-not-release-or-master

18
.dockerignore Normal file
View File

@@ -0,0 +1,18 @@
.awcache
.dockerignore
.git
.gitignore
.github
.vscode
bin
data*
dist
docker
Dockerfile
docs
dump.rdb
node_modules
/local
/tmp
*.yml
*.md

View File

@@ -2,12 +2,12 @@ Follow the setup guide in README.md
### Rebuild frontend assets on source change
```
grunt && grunt watch
yarn watch
```
### Rerun tests on source change
```
grunt karma:dev
yarn jest
```
### Run tests for backend assets before commit
@@ -17,6 +17,6 @@ test -z "$(gofmt -s -l . | grep -v -E 'vendor/(github.com|golang.org|gopkg.in)'
### Run tests for frontend assets before commit
```
npm test
yarn test
go test -v ./pkg/...
```

20
.gitignore vendored
View File

@@ -1,8 +1,10 @@
node_modules
npm-debug.log
yarn-error.log
coverage/
.aws-config.json
awsconfig
/.awcache
/dist
/public/build
/public/views/index.html
@@ -31,25 +33,32 @@ public/css/*.min.css
*.tmp
.DS_Store
.vscode/
.vs/
/data/*
/bin/*
conf/custom.ini
fig.yml
docker-compose.yml
docker-compose.yaml
devenv/docker-compose.yml
devenv/docker-compose.yaml
/conf/provisioning/**/custom.yaml
/conf/provisioning/**/dev.yaml
/conf/ldap_dev.toml
profile.cov
/grafana
/local
.notouch
/Makefile.local
/pkg/cmd/grafana-cli/grafana-cli
/pkg/cmd/grafana-server/grafana-server
/pkg/cmd/grafana-server/debug
/pkg/extensions
debug.test
/examples/*/dist
/packaging/**/*.rpm
/packaging/**/*.deb
/packaging/**/*.tar.gz
# Ignore OSX indexing
.DS_Store
@@ -60,4 +69,9 @@ debug.test
/vendor/**/*_test.go
/vendor/**/.editorconfig
/vendor/**/appengine*
*.orig
*.orig
/devenv/bulk-dashboards/*.json
/devenv/bulk_alerting_dashboards/*.json
/scripts/build/release_publisher/release_publisher

View File

@@ -1,13 +0,0 @@
{
"disallowImplicitTypeConversion": ["string"],
"disallowKeywords": ["with"],
"disallowMultipleLineBreaks": true,
"disallowMixedSpacesAndTabs": true,
"disallowTrailingWhitespace": true,
"requireSpacesInFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideParentheses": true,
"validateIndentation": 2
}

View File

@@ -1,37 +0,0 @@
{
"browser": true,
"esversion": 6,
"bitwise":false,
"curly": true,
"eqnull": true,
"strict": false,
"devel": true,
"eqeqeq": true,
"forin": false,
"immed": true,
"supernew": true,
"expr": true,
"indent": 2,
"latedef": false,
"newcap": true,
"noarg": true,
"noempty": true,
"undef": true,
"boss": true,
"trailing": true,
"laxbreak": true,
"laxcomma": true,
"sub": true,
"unused": true,
"maxdepth": 6,
"maxlen": 140,
"globals": {
"System": true,
"Promise": true,
"define": true,
"require": true,
"Chromath": false,
"setImmediate": true
}
}

View File

@@ -1,4 +1,269 @@
# 5.1.0 (unreleased)
# 5.3.0 (unreleased)
# 5.3.0-beta2 (2018-10-01)
### New Features
* **Annotations**: Enable template variables in tagged annotations queries [#9735](https://github.com/grafana/grafana/issues/9735)
* **Stackdriver**: Support for Google Stackdriver Datasource [#13289](https://github.com/grafana/grafana/pull/13289)
### Minor
* **Provisioning**: Dashboard Provisioning now support symlinks that changes target [#12534](https://github.com/grafana/grafana/issues/12534), thx [@auhlig](https://github.com/auhlig)
* **OAuth**: Allow oauth email attribute name to be configurable [#12986](https://github.com/grafana/grafana/issues/12986), thx [@bobmshannon](https://github.com/bobmshannon)
* **Tags**: Default sort order for GetDashboardTags [#11681](https://github.com/grafana/grafana/pull/11681), thx [@Jonnymcc](https://github.com/Jonnymcc)
* **Prometheus**: Label completion queries respect dashboard time range [#12251](https://github.com/grafana/grafana/pull/12251), thx [@mtanda](https://github.com/mtanda)
* **Prometheus**: Allow to display annotations based on Prometheus series value [#10159](https://github.com/grafana/grafana/issues/10159), thx [@mtanda](https://github.com/mtanda)
* **Prometheus**: Adhoc-filtering for Prometheus dashboards [#13212](https://github.com/grafana/grafana/issues/13212)
* **Singlestat**: Fix gauge display accuracy for percents [#13270](https://github.com/grafana/grafana/issues/13270), thx [@tianon](https://github.com/tianon)
* **Dashboard**: Prevent auto refresh from starting when loading dashboard with absolute time range [#12030](https://github.com/grafana/grafana/issues/12030)
* **Templating**: New templating variable type `Text box` that allows free text input [#3173](https://github.com/grafana/grafana/issues/3173)
* **Alerting**: Link to view full size image in Microsoft Teams alert notifier [#13121](https://github.com/grafana/grafana/issues/13121), thx [@holiiveira](https://github.com/holiiveira)
* **Alerting**: Fixes a bug where all alerts would send reminders after upgrade & restart [#13402](https://github.com/grafana/grafana/pull/13402)
* **Alerting**: Concurrent render limit for graphs used in notifications [#13401](https://github.com/grafana/grafana/pull/13401)
* **Postgres/MySQL/MSSQL**: Add support for replacing $__interval and $__interval_ms in alert queries [#11555](https://github.com/grafana/grafana/issues/11555), thx [@svenklemm](https://github.com/svenklemm)
# 5.3.0-beta1 (2018-09-06)
### New Major Features
* **Alerting**: Notification reminders [#7330](https://github.com/grafana/grafana/issues/7330), thx [@jbaublitz](https://github.com/jbaublitz)
* **Dashboard**: TV & Kiosk mode changes, new cycle view mode button in dashboard toolbar [#13025](https://github.com/grafana/grafana/pull/13025)
* **OAuth**: Gitlab OAuth with support for filter by groups [#5623](https://github.com/grafana/grafana/issues/5623), thx [@BenoitKnecht](https://github.com/BenoitKnecht)
* **Postgres**: Graphical query builder [#10095](https://github.com/grafana/grafana/issues/10095), thx [svenklemm](https://github.com/svenklemm)
### New Features
* **LDAP**: Define Grafana Admin permission in ldap group mappings [#2469](https://github.com/grafana/grafana/issues/2496), PR [#12622](https://github.com/grafana/grafana/issues/12622)
* **LDAP**: Client certificates support [#12805](https://github.com/grafana/grafana/issues/12805), thx [@nyxi](https://github.com/nyxi)
* **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)
* **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)
### Minor
* **Alerting**: Its now possible to configure the default value for how to handle errors and no data in alerting. [#10424](https://github.com/grafana/grafana/issues/10424)
* **Alerting**: Fix diff and percent_diff reducers [#11563](https://github.com/grafana/grafana/issues/11563), thx [@jessetane](https://github.com/jessetane)
* **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)
* **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)
* **Prometheus**: Heatmap - fix unhandled error when some points are missing [#12484](https://github.com/grafana/grafana/issues/12484)
* **Prometheus**: Add $__interval, $__interval_ms, $__range, $__range_s & $__range_ms support for dashboard and template queries [#12597](https://github.com/grafana/grafana/issues/12597) [#12882](https://github.com/grafana/grafana/issues/12882), thx [@roidelapluie](https://github.com/roidelapluie)
* **Elasticsearch**: For alerting/backend, support having index name to the right of pattern in index pattern [#12731](https://github.com/grafana/grafana/issues/12731)
* **Graphite**: Fix for quoting of int function parameters (when using variables) [#11927](https://github.com/grafana/grafana/pull/11927)
* **InfluxDB**: Support timeFilter in query templating for InfluxDB [#12598](https://github.com/grafana/grafana/pull/12598), thx [kichristensen](https://github.com/kichristensen)
* **Postgres/MySQL/MSSQL**: New $__unixEpochGroup and $__unixEpochGroupAlias macros [#12892](https://github.com/grafana/grafana/issues/12892), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Add previous fill mode to $__timeGroup macro which will fill in previously seen value when point is missing [#12756](https://github.com/grafana/grafana/issues/12756), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Use floor rounding in $__timeGroup macro function [#12460](https://github.com/grafana/grafana/issues/12460), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Use metric column as prefix when returning multiple value columns [#12727](https://github.com/grafana/grafana/issues/12727), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: New $__timeGroupAlias macro. Postgres $__timeGroup no longer automatically adds time column alias [#12749](https://github.com/grafana/grafana/issues/12749), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Escape single quotes in variables [#12785](https://github.com/grafana/grafana/issues/12785), thx [@eMerzh](https://github.com/eMerzh)
* **Postgres/MySQL/MSSQL**: Min time interval support [#13157](https://github.com/grafana/grafana/issues/13157), thx [@svenklemm](https://github.com/svenklemm)
* **MySQL/MSSQL**: Use datetime format instead of epoch for $__timeFilter, $__timeFrom and $__timeTo macros [#11618](https://github.com/grafana/grafana/issues/11618) [#11619](https://github.com/grafana/grafana/issues/11619), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
* **Postgres**: Escape ssl mode parameter in connectionstring [#12644](https://github.com/grafana/grafana/issues/12644), thx [@yogyrahmawan](https://github.com/yogyrahmawan)
* **Cloudwatch**: Improved error handling [#12489](https://github.com/grafana/grafana/issues/12489), thx [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: AppSync metrics and dimensions [#12300](https://github.com/grafana/grafana/issues/12300), thx [@franciscocpg](https://github.com/franciscocpg)
* **Cloudwatch**: Direct Connect metrics and dimensions [#12762](https://github.com/grafana/grafana/pulls/12762), thx [@mindriot88](https://github.com/mindriot88)
* **Cloudwatch**: Added BurstBalance metric to list of AWS RDS metrics [#12561](https://github.com/grafana/grafana/pulls/12561), thx [@activeshadow](https://github.com/activeshadow)
* **Cloudwatch**: Add new Redshift metrics and dimensions [#12063](https://github.com/grafana/grafana/pulls/12063), thx [@A21z](https://github.com/A21z)
* **Dashboard**: Fix selecting current dashboard from search should not reload dashboard [#12248](https://github.com/grafana/grafana/issues/12248)
* **Dashboard**: Use uid when linking to dashboards internally in a dashboard [#10705](https://github.com/grafana/grafana/issues/10705)
* **Graph**: Option to hide series from tooltip [#3341](https://github.com/grafana/grafana/issues/3341), thx [@mtanda](https://github.com/mtanda)
* **Singlestat**: Make colorization of prefix and postfix optional in singlestat [#11892](https://github.com/grafana/grafana/pull/11892), thx [@ApsOps](https://github.com/ApsOps)
* **Table**: Adjust header contrast for the light theme [#12668](https://github.com/grafana/grafana/issues/12668)
* **Table**: Fix link color when using light theme and thresholds in use [#12766](https://github.com/grafana/grafana/issues/12766)
* **Table**: Fix for useless horizontal scrollbar for table panel [#9964](https://github.com/grafana/grafana/issues/9964)
* **Table**: Make table sorting stable when null values exist [#12362](https://github.com/grafana/grafana/pull/12362), thx [@bz2](https://github.com/bz2)
* **Heatmap**: Fix broken tooltip and crosshair on Firefox [#12486](https://github.com/grafana/grafana/issues/12486)
* **Datasource**: Fix UI issue with secret fields after updating datasource [#11270](https://github.com/grafana/grafana/issues/11270)
* **Variables**: Skip unneeded extra query request when de-selecting variable values used for repeated panels [#8186](https://github.com/grafana/grafana/issues/8186), thx [@mtanda](https://github.com/mtanda)
* **Variables**: Limit amount of queries executed when updating variable that other variable(s) are dependent on [#11890](https://github.com/grafana/grafana/issues/11890)
* **Variables**: Support query variable refresh when another variable referenced in `Regex` field change its value [#12952](https://github.com/grafana/grafana/issues/12952), thx [@franciscocpg](https://github.com/franciscocpg)
* **Variables**: Support variables in query variable `Custom all value` field [#12965](https://github.com/grafana/grafana/issues/12965), thx [@franciscocpg](https://github.com/franciscocpg)
* **Units**: Change units to include characters for power of 2 and 3 [#12744](https://github.com/grafana/grafana/pull/12744), thx [@Worty](https://github.com/Worty)
* **Units**: Polish złoty currency [#12691](https://github.com/grafana/grafana/pull/12691), thx [@mwegrzynek](https://github.com/mwegrzynek)
* **Units**: Adds bitcoin axes unit. [#13125](https://github.com/grafana/grafana/pull/13125)
* **Api**: Delete nonexistent datasource should return 404 [#12313](https://github.com/grafana/grafana/issues/12313), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
* **Logging**: Reopen log files after receiving a SIGHUP signal [#13112](https://github.com/grafana/grafana/pull/13112), thx [@filewalkwithme](https://github.com/filewalkwithme)
* **Login**: Show loading animation while waiting for authentication response on login [#12865](https://github.com/grafana/grafana/issues/12865)
* **UI**: Fix iOS home screen "app" icon and Windows 10 app experience [#12752](https://github.com/grafana/grafana/issues/12752), thx [@andig](https://github.com/andig)
* **Plugins**: Convert URL-like text to links in plugins readme [#12843](https://github.com/grafana/grafana/pull/12843), thx [pgiraud](https://github.com/pgiraud)
### Breaking changes
* Postgres datasource no longer automatically adds time column alias when using the $__timeGroup alias. However, there's code in place which should make this change backward compatible and shouldn't create any issues.
* Kiosk mode now also hides submenu (variables)
* ?inactive url parameter no longer supported, replaced with kiosk=tv url parameter
### New experimental features
These are new features that's still being worked on and are in an experimental phase. We encourage users to try these out and provide any feedback in related issue.
* **Dashboard**: Auto fit dashboard panels to optimize space used for current TV / Monitor [#12768](https://github.com/grafana/grafana/issues/12768)
### Tech
* **Frontend**: Convert all Frontend Karma tests to Jest tests [#12224](https://github.com/grafana/grafana/issues/12224)
* **Backend**: Upgrade to golang 1.11 [#13030](https://github.com/grafana/grafana/issues/13030)
# 5.2.4 (2018-09-07)
* **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)
# 5.2.3 (2018-08-29)
### Important fix for LDAP & OAuth login vulnerability
See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
# 5.2.2 (2018-07-25)
### Minor
* **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
* **Dashboard**: Dashboard links not updated when changing variables [#12506](https://github.com/grafana/grafana/issues/12506)
* **Postgres/MySQL/MSSQL**: Fix connection leak [#12636](https://github.com/grafana/grafana/issues/12636) [#9827](https://github.com/grafana/grafana/issues/9827)
* **Plugins**: Fix loading of external plugins [#12551](https://github.com/grafana/grafana/issues/12551)
* **Dashboard**: Remove unwanted scrollbars in embedded panels [#12589](https://github.com/grafana/grafana/issues/12589)
* **Prometheus**: Prevent error using $__interval_ms in query [#12533](https://github.com/grafana/grafana/pull/12533), thx [@mtanda](https://github.com/mtanda)
# 5.2.1 (2018-06-29)
### Minor
* **Auth Proxy**: Important security fix for whitelist of IP address feature [#12444](https://github.com/grafana/grafana/pull/12444)
* **UI**: Fix - Grafana footer overlapping page [#12430](https://github.com/grafana/grafana/issues/12430)
* **Logging**: Errors should be reported before crashing [#12438](https://github.com/grafana/grafana/issues/12438)
# 5.2.0-stable (2018-06-27)
### Minor
* **Plugins**: Handle errors correctly when loading datasource plugin [#12383](https://github.com/grafana/grafana/pull/12383) thx [@rozetko](https://github.com/rozetko)
* **Render**: Enhance error message if phantomjs executable is not found [#11868](https://github.com/grafana/grafana/issues/11868)
* **Dashboard**: Set correct text in drop down when variable is present in url [#11968](https://github.com/grafana/grafana/issues/11968)
### 5.2.0-beta3 fixes
* **LDAP**: Handle "dn" ldap attribute more gracefully [#12385](https://github.com/grafana/grafana/pull/12385), reverts [#10970](https://github.com/grafana/grafana/pull/10970)
# 5.2.0-beta3 (2018-06-21)
### Minor
* **Build**: All rpm packages should be signed [#12359](https://github.com/grafana/grafana/issues/12359)
# 5.2.0-beta2 (2018-06-20)
### New Features
* **Dashboard**: Import dashboard to folder [#10796](https://github.com/grafana/grafana/issues/10796)
### Minor
* **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
* **Dashboard**: Fix so panel titles doesn't wrap [#11074](https://github.com/grafana/grafana/issues/11074)
* **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)
* **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)
* **Auth Proxy**: Whitelist proxy IP address instead of client IP address [#10707](https://github.com/grafana/grafana/issues/10707)
* **User Management**: Make sure that a user always has a current org assigned [#11076](https://github.com/grafana/grafana/issues/11076)
* **Snapshots**: Fix: annotations not properly extracted leading to incorrect rendering of annotations [#12278](https://github.com/grafana/grafana/issues/12278)
* **LDAP**: Allow use of DN in group_search_filter_user_attribute and member_of [#3132](https://github.com/grafana/grafana/issues/3132), thx [@mmolnar](https://github.com/mmolnar)
* **Graph**: Fix legend decimals precision calculation [#11792](https://github.com/grafana/grafana/issues/11792)
* **Dashboard**: Make sure to process panels in collapsed rows when exporting dashboard [#12256](https://github.com/grafana/grafana/issues/12256)
### 5.2.0-beta1 fixes
* **Dashboard**: Dashboard link doesn't work when "As dropdown" option is checked [#12315](https://github.com/grafana/grafana/issues/12315)
* **Dashboard**: Fix regressions after save modal changes, including adhoc template issues [#12240](https://github.com/grafana/grafana/issues/12240)
* **Docker**: Config keys ending with _FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)
# 5.2.0-beta1 (2018-06-05)
### New Features
* **Elasticsearch**: Alerting support [#5893](https://github.com/grafana/grafana/issues/5893), thx [@WPH95](https://github.com/WPH95)
* **Build**: Crosscompile and packages Grafana on arm, windows, linux and darwin [#11920](https://github.com/grafana/grafana/pull/11920), thx [@fg2it](https://github.com/fg2it)
* **Login**: Change admin password after first login [#11882](https://github.com/grafana/grafana/issues/11882)
* **Alert list panel**: Updated to support filtering alerts by name, dashboard title, folder, tags [#11500](https://github.com/grafana/grafana/issues/11500), [#8168](https://github.com/grafana/grafana/issues/8168), [#6541](https://github.com/grafana/grafana/issues/6541)
### Minor
* **Dashboard**: Modified time range and variables are now not saved by default [#10748](https://github.com/grafana/grafana/issues/10748), [#8805](https://github.com/grafana/grafana/issues/8805)
* **Graph**: Show invisible highest value bucket in histogram [#11498](https://github.com/grafana/grafana/issues/11498)
* **Dashboard**: Enable "Save As..." if user has edit permission [#11625](https://github.com/grafana/grafana/issues/11625)
* **Prometheus**: Query dates are now step-aligned [#10434](https://github.com/grafana/grafana/pull/10434)
* **Prometheus**: Table columns order now changes when rearrange queries [#11690](https://github.com/grafana/grafana/issues/11690), thx [@mtanda](https://github.com/mtanda)
* **Variables**: Fix variable interpolation when using multiple formatting types [#11800](https://github.com/grafana/grafana/issues/11800), thx [@svenklemm](https://github.com/svenklemm)
* **Dashboard**: Fix date selector styling for dark/light theme in time picker control [#11616](https://github.com/grafana/grafana/issues/11616)
* **Discord**: Alert notification channel type for Discord, [#7964](https://github.com/grafana/grafana/issues/7964) thx [@jereksel](https://github.com/jereksel),
* **InfluxDB**: Support SELECT queries in templating query, [#5013](https://github.com/grafana/grafana/issues/5013)
* **InfluxDB**: Support count distinct aggregation [#11645](https://github.com/grafana/grafana/issues/11645), thx [@kichristensen](https://github.com/kichristensen)
* **Dashboard**: JSON Model under dashboard settings can now be updated & changes saved, [#1429](https://github.com/grafana/grafana/issues/1429), thx [@jereksel](https://github.com/jereksel)
* **Security**: Fix XSS vulnerabilities in dashboard links [#11813](https://github.com/grafana/grafana/pull/11813)
* **Singlestat**: Fix "time of last point" shows local time when dashboard timezone set to UTC [#10338](https://github.com/grafana/grafana/issues/10338)
* **Prometheus**: Add support for passing timeout parameter to Prometheus [#11788](https://github.com/grafana/grafana/pull/11788), thx [@mtanda](https://github.com/mtanda)
* **Login**: Add optional option sign out url for generic oauth [#9847](https://github.com/grafana/grafana/issues/9847), thx [@roidelapluie](https://github.com/roidelapluie)
* **Login**: Use proxy server from environment variable if available [#9703](https://github.com/grafana/grafana/issues/9703), thx [@iyeonok](https://github.com/iyeonok)
* **Invite users**: Friendlier error message when smtp is not configured [#12087](https://github.com/grafana/grafana/issues/12087), thx [@thurt](https://github.com/thurt)
* **Graphite**: Don't send distributed tracing headers when using direct/browser access mode [#11494](https://github.com/grafana/grafana/issues/11494)
* **Sidenav**: Show create dashboard link for viewers if at least editor in one folder [#11858](https://github.com/grafana/grafana/issues/11858)
* **SQL**: Second epochs are now correctly converted to ms. [#12085](https://github.com/grafana/grafana/pull/12085)
* **Singlestat**: Fix singlestat threshold tooltip [#11971](https://github.com/grafana/grafana/issues/11971)
* **Dashboard**: Hide grid controls in fullscreen/low-activity views [#11771](https://github.com/grafana/grafana/issues/11771)
* **Dashboard**: Validate uid when importing dashboards [#11515](https://github.com/grafana/grafana/issues/11515)
* **Docker**: Support for env variables ending with _FILE [grafana-docker #166](https://github.com/grafana/grafana-docker/pull/166), thx [@efrecon](https://github.com/efrecon)
* **Alert list panel**: Show alerts for user with viewer role [#11167](https://github.com/grafana/grafana/issues/11167)
* **Provisioning**: Verify checksum of dashboards before updating to reduce load on database [#11670](https://github.com/grafana/grafana/issues/11670)
* **Provisioning**: Support symlinked files in dashboard provisioning config files [#11958](https://github.com/grafana/grafana/issues/11958)
* **Dashboard list panel**: Search dashboards by folder [#11525](https://github.com/grafana/grafana/issues/11525)
* **Sidenav**: Always show server admin link in sidenav if grafana admin [#11657](https://github.com/grafana/grafana/issues/11657)
# 5.1.5 (2018-06-27)
* **Docker**: Config keys ending with _FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)
# 5.1.4 (2018-06-19)
* **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
# 5.1.3 (2018-05-16)
* **Scroll**: Graph panel / legend texts shifts on the left each time we move scrollbar on firefox [#11830](https://github.com/grafana/grafana/issues/11830)
# 5.1.2 (2018-05-09)
* **Database**: Fix MySql migration issue [#11862](https://github.com/grafana/grafana/issues/11862)
* **Google Analytics**: Enable Google Analytics anonymizeIP setting for GDPR [#11656](https://github.com/grafana/grafana/pull/11656)
# 5.1.1 (2018-05-07)
* **LDAP**: LDAP login with MariaDB/MySQL database and dn>100 chars not possible [#11754](https://github.com/grafana/grafana/issues/11754)
* **Build**: AppVeyor Windows build missing version and commit info [#11758](https://github.com/grafana/grafana/issues/11758)
* **Scroll**: Scroll can't start in graphs on Chrome mobile [#11710](https://github.com/grafana/grafana/issues/11710)
* **Units**: Revert renaming of unit key ppm [#11743](https://github.com/grafana/grafana/issues/11743)
# 5.1.0 (2018-04-26)
* **Folders**: Default permissions on folder are not shown as inherited in its dashboards [#11668](https://github.com/grafana/grafana/issues/11668)
* **Templating**: Allow more than 20 previews when creating a variable [#11508](https://github.com/grafana/grafana/issues/11508)
* **Dashboard**: Row edit icon not shown [#11466](https://github.com/grafana/grafana/issues/11466)
* **SQL**: Unsupported data types for value column using time series query [#11703](https://github.com/grafana/grafana/issues/11703)
* **Prometheus**: Prometheus query inspector expands to be very large on autocomplete queries [#11673](https://github.com/grafana/grafana/issues/11673)
# 5.1.0-beta1 (2018-04-20)
* **MSSQL**: New Microsoft SQL Server data source [#10093](https://github.com/grafana/grafana/pull/10093), [#11298](https://github.com/grafana/grafana/pull/11298), thx [@linuxchips](https://github.com/linuxchips)
* **Prometheus**: The heatmap panel now support Prometheus histograms [#10009](https://github.com/grafana/grafana/issues/10009)
@@ -43,20 +308,20 @@
* **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 metre" [#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)
* **Provisioning**: Remove `id` from json when provisioning dashboards, [#11138](https://github.com/grafana/grafana/issues/11138)
* **Prometheus**: tooltip for legend format not showing properly [#11516](https://github.com/grafana/grafana/issues/11516), thx [@svenklemm](https://github.com/svenklemm)
* **Playlist**: Empty playlists cannot be deleted [#11133](https://github.com/grafana/grafana/issues/11133), thx [@kichristensen](https://github.com/kichristensen)
* **Prometheus**: tooltip for legend format not showing properly [#11516](https://github.com/grafana/grafana/issues/11516), thx [@svenklemm](https://github.com/svenklemm)
* **Playlist**: Empty playlists cannot be deleted [#11133](https://github.com/grafana/grafana/issues/11133), thx [@kichristensen](https://github.com/kichristensen)
* **Switch Orgs**: Alphabetic order in Switch Organization modal [#11556](https://github.com/grafana/grafana/issues/11556)
* **Postgres**: improve `$__timeFilter` macro [#11578](https://github.com/grafana/grafana/issues/11578), thx [@svenklemm](https://github.com/svenklemm)
* **Permission list**: Improved ux [#10747](https://github.com/grafana/grafana/issues/10747)
* **Dashboard**: Sizing and positioning of settings menu icons [#11572](https://github.com/grafana/grafana/pull/11572)
* **Dashboard**: Add search filter/tabs to new panel control [#10427](https://github.com/grafana/grafana/issues/10427)
* **Folders**: User with org viewer role should not be able to save/move dashboards in/to general folder [#11553](https://github.com/grafana/grafana/issues/11553)
* **Influxdb**: Dont assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
* **Influxdb**: Don't assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
### Tech
* Backend code simplification [#11613](https://github.com/grafana/grafana/pull/11613), thx [@knweiss](https://github.com/knweiss)
@@ -226,6 +491,12 @@ The following properties have been deprecated and will be removed in a future re
- `uri` property in `GET /api/search` -> Use new `url` or `uid` property instead
- `meta.slug` property in `GET /api/dashboards/uid/:uid` and `GET /api/dashboards/db/:slug` -> Use new `meta.url` or `dashboard.uid` property instead
# 4.6.4 (2018-08-29)
### Important fix for LDAP & OAuth login vulnerability
See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
# 4.6.3 (2017-12-14)
## Fixes
@@ -237,7 +508,7 @@ The following properties have been deprecated and will be removed in a future re
# 4.6.2 (2017-11-16)
## Important
* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if your using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if you're using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
## Fixes
* **Color picker**: Bug after using textbox input field to change/paste color string [#9769](https://github.com/grafana/grafana/issues/9769)
@@ -1196,8 +1467,8 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
**New features**
- [Issue #1623](https://github.com/grafana/grafana/issues/1623). Share Dashboard: Dashboard snapshot sharing (dash and data snapshot), save to local or save to public snapshot dashboard snapshots.raintank.io site
- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embedd a single graph on another web site
- [Issue #718](https://github.com/grafana/grafana/issues/718). Dashboard: When saving a dashboard and another user has made changes in between the user is promted with a warning if he really wants to overwrite the other's changes
- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embed a single graph on another web site
- [Issue #718](https://github.com/grafana/grafana/issues/718). Dashboard: When saving a dashboard and another user has made changes in between the user is prompted with a warning if he really wants to overwrite the other's changes
- [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views
- [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, useful when you want to ignore last minute because it contains incomplete data
- [Issue #171](https://github.com/grafana/grafana/issues/171). Panel: Different time periods, panels can override dashboard relative time and/or add a time shift
@@ -1655,3 +1926,4 @@ Thanks to everyone who contributed fixes and provided feedback :+1:
# 1.0.0 (2014-01-19)
First public release

82
Dockerfile Normal file
View File

@@ -0,0 +1,82 @@
# Golang build container
FROM golang:1.11
WORKDIR $GOPATH/src/github.com/grafana/grafana
COPY Gopkg.toml Gopkg.lock ./
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
COPY pkg pkg
COPY build.go build.go
COPY package.json package.json
RUN go run build.go build
# Node build container
FROM node:8
WORKDIR /usr/src/app/
COPY package.json yarn.lock ./
RUN yarn install --pure-lockfile --no-progress
COPY Gruntfile.js tsconfig.json tslint.json ./
COPY public public
COPY scripts scripts
COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
# Final container
FROM debian:stretch-slim
ARG GF_UID="472"
ARG GF_GID="472"
ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
GF_PATHS_DATA="/var/lib/grafana" \
GF_PATHS_HOME="/usr/share/grafana" \
GF_PATHS_LOGS="/var/log/grafana" \
GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
WORKDIR $GF_PATHS_HOME
RUN apt-get update && apt-get install -qq -y libfontconfig ca-certificates && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*
COPY conf ./conf
RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
groupadd -r -g $GF_GID grafana && \
useradd -r -u $GF_UID -g grafana grafana && \
mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
"$GF_PATHS_PROVISIONING/dashboards" \
"$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"
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
COPY --from=1 /usr/src/app/tools ./tools
COPY tools/phantomjs/render.js ./tools/phantomjs/render.js
EXPOSE 3000
COPY ./packaging/docker/run.sh /run.sh
USER grafana
ENTRYPOINT [ "/run.sh" ]

353
Gopkg.lock generated
View File

@@ -4,8 +4,8 @@
[[projects]]
name = "cloud.google.com/go"
packages = ["compute/metadata"]
revision = "767c40d6a2e058483c25fa193e963a22da17236d"
version = "v0.18.0"
revision = "056a55f54a6cc77b440b31a56a5e7c3982d32811"
version = "v0.22.0"
[[projects]]
name = "github.com/BurntSushi/toml"
@@ -20,16 +20,51 @@
revision = "7677a1d7c1137cd3dd5ba7a076d0c898a1ef4520"
[[projects]]
name = "github.com/apache/thrift"
packages = ["lib/go/thrift"]
revision = "b2a4d4ae21c789b689dd162deb819665567f481c"
version = "0.10.0"
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/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/ec2query","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 = "decd990ddc5dcdf2f73309cbcab90d06b996ca28"
version = "v1.12.67"
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"
@@ -41,7 +76,7 @@
branch = "master"
name = "github.com/beorn7/perks"
packages = ["quantile"]
revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
[[projects]]
branch = "master"
@@ -75,20 +110,35 @@
[[projects]]
name = "github.com/denisenkom/go-mssqldb"
packages = [".","internal/cp"]
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 = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"
version = "v1.5.0"
revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
version = "v1.7.0"
[[projects]]
name = "github.com/go-ini/ini"
packages = ["."]
revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
version = "v1.32.0"
revision = "6529cf7c58879c08d927016dde4477f18a0634cb"
version = "v1.36.0"
[[projects]]
name = "github.com/go-ldap/ldap"
@@ -117,7 +167,12 @@
[[projects]]
branch = "master"
name = "github.com/go-macaron/session"
packages = [".","memcache","postgres","redis"]
packages = [
".",
"memcache",
"postgres",
"redis"
]
revision = "b8e286a0dba8f4999042d6b258daf51b31d08938"
[[projects]]
@@ -132,10 +187,10 @@
version = "v1.7.0"
[[projects]]
branch = "master"
name = "github.com/go-xorm/builder"
packages = ["."]
revision = "488224409dd8aa2ce7a5baf8d10d55764a913738"
revision = "bad0a612f0d6277b953910822ab5dfb30dd18237"
version = "v0.2.0"
[[projects]]
name = "github.com/go-xorm/core"
@@ -152,14 +207,20 @@
[[projects]]
branch = "master"
name = "github.com/golang/protobuf"
packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"]
revision = "c65a0412e71e8b9b3bfd22925720d23c0f054237"
packages = [
"proto",
"ptypes",
"ptypes/any",
"ptypes/duration",
"ptypes/timestamp"
]
revision = "927b65914520a8b7d44f5c9057611cfec6b2e2d0"
[[projects]]
branch = "master"
name = "github.com/gopherjs/gopherjs"
packages = ["js"]
revision = "178c176a91fe05e3e6c58fa5c989bad19e6cdcb3"
revision = "8dffc02ea1cb8398bb73f30424697c60fcf8d4c5"
[[projects]]
name = "github.com/gorilla/websocket"
@@ -175,32 +236,35 @@
[[projects]]
branch = "master"
name = "github.com/grafana/grafana_plugin_model"
packages = ["go/datasource"]
revision = "dfe5dc0a6ce05825ba7fe2d0323d92e631bffa89"
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 = "5bcb0f17e36442247290887cc914a6e507afa5c4"
revision = "69ff559dc25f3b435631604f573a5fa1efdb6433"
[[projects]]
name = "github.com/hashicorp/go-plugin"
packages = ["."]
revision = "3e6d191694b5a3a2b99755f31b47fa209e4bcd09"
revision = "e8d22c780116115ae5624720c9af0c97afe4f551"
[[projects]]
branch = "master"
name = "github.com/hashicorp/go-version"
packages = ["."]
revision = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee"
revision = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"
[[projects]]
branch = "master"
name = "github.com/hashicorp/yamux"
packages = ["."]
revision = "683f49123a33db61abfb241b7ac5e4af4dc54d55"
revision = "2658be15c5f05e76244154714161f17e3e77de2e"
[[projects]]
name = "github.com/inconshreveable/log15"
@@ -221,7 +285,10 @@
[[projects]]
name = "github.com/klauspost/compress"
packages = ["flate","gzip"]
packages = [
"flate",
"gzip"
]
revision = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf"
version = "v1.2.1"
@@ -238,22 +305,25 @@
version = "v1.1"
[[projects]]
branch = "master"
name = "github.com/kr/pretty"
packages = ["."]
revision = "cfb55aafdaf3ec08f0db22699ab822c50091b1c4"
revision = "73f6ac0b30a98e433b289500d779f50c1a6f0712"
version = "v0.1.0"
[[projects]]
branch = "master"
name = "github.com/kr/text"
packages = ["."]
revision = "7cafcd837844e784b526369c9bce262804aebc60"
revision = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"
version = "v0.1.0"
[[projects]]
branch = "master"
name = "github.com/lib/pq"
packages = [".","oid"]
revision = "61fe37aa2ee24fabcdbe5c4ac1d4ac566f88f345"
packages = [
".",
"oid"
]
revision = "d34b9ff171c21ad295489235aec8b6626023cd04"
[[projects]]
name = "github.com/mattn/go-colorable"
@@ -270,8 +340,8 @@
[[projects]]
name = "github.com/mattn/go-sqlite3"
packages = ["."]
revision = "6c771bb9887719704b210e87e934f08be014bdb1"
version = "v1.6.0"
revision = "323a32be5a2421b8c7087225079c6c900ec397cd"
version = "v1.7.0"
[[projects]]
name = "github.com/matttproud/golang_protobuf_extensions"
@@ -285,9 +355,19 @@
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"]
packages = [
".",
"ext",
"log"
]
revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"
version = "v1.0.2"
@@ -297,9 +377,20 @@
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"]
packages = [
"api",
"api/prometheus/v1",
"prometheus",
"prometheus/promhttp"
]
revision = "967789050ba94deca04a5e84cce8ad472ce313c1"
version = "v0.9.0-pre1"
@@ -312,14 +403,23 @@
[[projects]]
branch = "master"
name = "github.com/prometheus/common"
packages = ["expfmt","internal/bitbucket.org/ww/goautoneg","model"]
revision = "89604d197083d4781071d3c65855d24ecfb0a563"
packages = [
"expfmt",
"internal/bitbucket.org/ww/goautoneg",
"model"
]
revision = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"
[[projects]]
branch = "master"
name = "github.com/prometheus/procfs"
packages = [".","internal/util","nfsd","xfs"]
revision = "85fadb6e89903ef7cca6f6a804474cd5ea85b6e1"
packages = [
".",
"internal/util",
"nfs",
"xfs"
]
revision = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"
[[projects]]
branch = "master"
@@ -328,20 +428,28 @@
revision = "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c"
[[projects]]
branch = "master"
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 = "0b37b35ec7434b77e77a4bb29b79677cced992ea"
version = "1.8.1"
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"]
packages = [
"convey",
"convey/gotest",
"convey/reporting"
]
revision = "9e8dc3f972df6c8fcc0375ef492c24d0bb204857"
version = "1.6.3"
@@ -353,19 +461,39 @@
[[projects]]
name = "github.com/uber/jaeger-client-go"
packages = [".","config","internal/baggage","internal/baggage/remote","internal/spanlog","log","rpcmetrics","thrift-gen/agent","thrift-gen/baggage","thrift-gen/jaeger","thrift-gen/sampling","thrift-gen/zipkincore","utils"]
revision = "3ac96c6e679cb60a74589b0d0aa7c70a906183f7"
version = "v2.11.2"
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 = "7f95f4f7e80028096410abddaae2556e4c61b59f"
version = "v1.3.1"
revision = "ed3a127ec5fef7ae9ea95b01b542c47fbd999ce5"
version = "v1.5.0"
[[projects]]
name = "github.com/yudai/gojsondiff"
packages = [".","formatter"]
packages = [
".",
"formatter"
]
revision = "7b1b7adf999dab73a6eb02669c3d82dbb27a3dd6"
version = "1.0.0"
@@ -378,42 +506,87 @@
[[projects]]
branch = "master"
name = "golang.org/x/crypto"
packages = ["md4","pbkdf2"]
revision = "3d37316aaa6bd9929127ac9a527abf408178ea7b"
packages = [
"md4",
"pbkdf2"
]
revision = "1a580b3eff7814fc9b40602fd35256c63b50f491"
[[projects]]
branch = "master"
name = "golang.org/x/net"
packages = ["context","context/ctxhttp","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"]
revision = "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec"
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 = "b28fcf2b08a19742b43084fb40ab78ac6c3d8067"
packages = [
".",
"google",
"internal",
"jws",
"jwt"
]
revision = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269"
[[projects]]
branch = "master"
name = "golang.org/x/sync"
packages = ["errgroup"]
revision = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"
revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
[[projects]]
branch = "master"
name = "golang.org/x/sys"
packages = ["unix"]
revision = "af50095a40f9041b3b38960738837185c26e9419"
revision = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"
[[projects]]
branch = "master"
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 = "e19ae1496984b1c655b8044a65c0300a3c878dd3"
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"]
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"
@@ -421,13 +594,39 @@
branch = "master"
name = "google.golang.org/genproto"
packages = ["googleapis/rpc/status"]
revision = "a8101f21cf983e773d0c1133ebc5424792003214"
revision = "7bb2a897381c9c5ab2aeb8614f758d7766af68ff"
[[projects]]
name = "google.golang.org/grpc"
packages = [".","balancer","balancer/base","balancer/roundrobin","codes","connectivity","credentials","encoding","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 = "6b51017f791ae1cfbec89c52efdf444b13b550ef"
version = "v1.9.2"
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"
@@ -450,14 +649,14 @@
[[projects]]
name = "gopkg.in/ini.v1"
packages = ["."]
revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
version = "v1.32.0"
revision = "6529cf7c58879c08d927016dde4477f18a0634cb"
version = "v1.36.0"
[[projects]]
name = "gopkg.in/macaron.v1"
packages = ["."]
revision = "75f2e9b42e99652f0d82b28ccb73648f44615faa"
version = "v1.2.4"
revision = "c1be95e6d21e769e44e1ec33cec9da5837861c10"
version = "v1.3.1"
[[projects]]
branch = "v2"
@@ -472,14 +671,14 @@
version = "v2.3.2"
[[projects]]
branch = "v2"
name = "gopkg.in/yaml.v2"
packages = ["."]
revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
version = "v2.2.1"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "ad3c71fd3244369c313978e9e7464c7116faee764386439a17de0707a08103aa"
inputs-digest = "6e9458f912a5f0eb3430b968f1b4dbc4e3b7671b282cf4fe1573419a6d9ba0d4"
solver-name = "gps-cdcl"
solver-version = 1

View File

@@ -36,7 +36,7 @@ ignored = [
[[constraint]]
name = "github.com/aws/aws-sdk-go"
version = "1.12.65"
version = "1.13.56"
[[constraint]]
branch = "master"
@@ -85,11 +85,11 @@ ignored = [
[[constraint]]
name = "github.com/go-xorm/core"
version = "0.5.7"
version = "=0.5.7"
[[constraint]]
name = "github.com/go-xorm/xorm"
version = "0.6.4"
version = "=0.6.4"
[[constraint]]
name = "github.com/gorilla/websocket"
@@ -101,12 +101,16 @@ ignored = [
[[constraint]]
branch = "master"
name = "github.com/grafana/grafana_plugin_model"
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"
@@ -125,7 +129,7 @@ ignored = [
[[constraint]]
name = "github.com/mattn/go-sqlite3"
version = "1.6.0"
version = "1.7.0"
[[constraint]]
name = "github.com/opentracing/opentracing-go"
@@ -199,3 +203,7 @@ ignored = [
[[constraint]]
name = "github.com/denisenkom/go-mssqldb"
revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"
[[constraint]]
name = "github.com/VividCortex/mysqlerr"
branch = "master"

View File

@@ -1,4 +1,3 @@
/* jshint node:true */
'use strict';
module.exports = function (grunt) {
var os = require('os');
@@ -12,6 +11,10 @@ module.exports = function (grunt) {
platform: process.platform.replace('win32', 'windows'),
};
if (grunt.option('platform')) {
config.platform = grunt.option('platform');
}
if (grunt.option('arch')) {
config.arch = grunt.option('arch');
} else {
@@ -22,7 +25,6 @@ module.exports = function (grunt) {
}
}
config.coverage = grunt.option('coverage');
config.phjs = grunt.option('phjsToRelease');
config.pkg.version = grunt.option('pkgVer') || config.pkg.version;

View File

@@ -1,3 +1,5 @@
-include local/Makefile
all: deps build
deps-go:
@@ -22,6 +24,15 @@ build-js:
build: build-go build-js
build-docker-dev:
@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
cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
cd packaging/docker && docker build --tag grafana/grafana:dev .
build-docker-full:
docker build --tag grafana/grafana:dev .
test-go:
go test -v ./pkg/...
@@ -32,6 +43,3 @@ test: test-go test-js
run:
./bin/grafana-server
protoc:
protoc -I pkg/tsdb/models pkg/tsdb/models/*.proto --go_out=plugins=grpc:pkg/tsdb/models/.

View File

@@ -1,5 +1,5 @@
Copyright 2014-2017 Grafana Labs
Copyright 2014-2018 Grafana Labs
This software is based on Kibana:
Copyright 2012-2013 Elasticsearch BV

View File

@@ -24,7 +24,7 @@ the latest master builds [here](https://grafana.com/grafana/download)
### Dependencies
- Go 1.10
- Go 1.11
- NodeJS LTS
### Building the backend
@@ -39,20 +39,24 @@ go run build.go build
For this you need nodejs (v.6+).
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
npm run watch
yarn watch
```
Run tests
Build the assets, rebuild on file change with Hot Module Replacement (HMR), and serve them by webpack-dev-server (http://localhost:3333):
```bash
npm run jest
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 karma tests
Run tests
```bash
npm run karma
yarn jest
```
### Recompile backend on source change
@@ -65,6 +69,15 @@ bra run
Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).
### Building a docker image (on linux/amd64)
This builds a docker image from your local sources:
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`
### Dev config
Create a custom.ini in the conf directory to override default configuration options.
@@ -80,30 +93,38 @@ In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode =
#### Frontend
Execute all frontend tests
```bash
npm run test
yarn test
```
Writing & watching frontend tests (we have two test runners)
Writing & watching frontend tests
- jest for all new tests that do not require browser context (React+more)
- Start watcher: `npm run jest`
- Jest will run all test files that end with the name ".jest.ts"
- karma + mocha is used for testing angularjs components. We do want to migrate these test to jest over time (if possible).
- Start watcher: `npm run karma`
- Karma+Mocha runs all files that end with the name "_specs.ts".
- Start watcher: `yarn jest`
- 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/...
go test ./pkg/...
# Run Golang tests using mysql as database - convenient to use /docker/blocks/mysql_tests
GRAFANA_TEST_DB=mysql go test ./pkg/...
GRAFANA_TEST_DB=mysql go test ./pkg/...
# Run Golang tests using postgres as database - convenient to use /docker/blocks/postgres_tests
GRAFANA_TEST_DB=postgres go test ./pkg/...
GRAFANA_TEST_DB=postgres go test ./pkg/...
```
## Building custom docker image
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
```
Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).
## Contribute
If you have any idea for an improvement or found a bug, do not hesitate to open an issue.

View File

@@ -1,40 +1,27 @@
# Roadmap (2018-02-22)
# 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)
- v5.1
- Build speed improvements & integration test execution
- Kubernetes friendly docker container
- Enterprise LDAP
- Provisioning workflow
- MSSQL datasource
### Mid term (2-4 months)
- v5.2
- Azure monitor backend rewrite
- Elasticsearch alerting
- First login registration view
- Backend plugins? (alert notifiers, auth)
- Crossplatform builds
- IFQL Initial support
### 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
- Change visualization (panel type) on the fly.
- Multi stat panel (vertical version of singlestat with bars/graph mode with big number etc)
- Repeat panel by query results
- 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
- 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).

View File

@@ -6,8 +6,8 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
environment:
nodejs_version: "6"
GOPATH: c:\gopath
GOVERSION: 1.10
GOPATH: C:\gopath
GOVERSION: 1.11
install:
- rmdir c:\go /s /q
@@ -38,16 +38,3 @@ artifacts:
- path: grafana-*windows-*.*
name: binzip
type: zip
deploy:
- provider: Environment
name: GrafanaReleaseMaster
on:
buildType: master
- provider: Environment
name: GrafanaReleaseRelease
on:
buildType: release

153
build.go
View File

@@ -16,22 +16,25 @@ import (
"os/exec"
"path"
"path/filepath"
"regexp"
"runtime"
"strconv"
"strings"
"time"
)
const (
windows = "windows"
linux = "linux"
)
var (
versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
goarch string
goos string
gocc string
gocxx string
cgo string
pkgArch string
version string = "v1"
//versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
goarch string
goos string
gocc string
cgo bool
pkgArch string
version string = "v1"
// deb & rpm does not support semver so have to handle their version a little differently
linuxPackageVersion string = "v1"
linuxPackageIteration string = ""
@@ -42,10 +45,9 @@ var (
buildNumber int = 0
binaries []string = []string{"grafana-server", "grafana-cli"}
isDev bool = false
enterprise bool = false
)
const minGoVersion = 1.8
func main() {
log.SetOutput(os.Stdout)
log.SetFlags(0)
@@ -55,18 +57,22 @@ func main() {
flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
flag.StringVar(&gocc, "cc", "", "CC")
flag.StringVar(&gocxx, "cxx", "", "CXX")
flag.StringVar(&cgo, "cgo-enabled", "", "CGO_ENABLED")
flag.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
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(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
flag.IntVar(&buildNumber, "buildNumber", 0, "Build number from CI system")
flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps")
flag.Parse()
readVersionFromPackageJson()
if pkgArch == "" {
pkgArch = goarch
}
log.Printf("Version: %s, Linux Version: %s, Package Iteration: %s\n", version, linuxPackageVersion, linuxPackageIteration)
if flag.NArg() == 0 {
@@ -94,18 +100,28 @@ func main() {
build("grafana-server", "./pkg/cmd/grafana-server", []string{})
case "build":
clean()
//clean()
for _, binary := range binaries {
build(binary, "./pkg/cmd/"+binary, []string{})
}
case "build-frontend":
grunt(gruntBuildArg("build")...)
case "test":
test("./pkg/...")
grunt("test")
case "package":
grunt(gruntBuildArg("release")...)
if runtime.GOOS != "windows" {
grunt(gruntBuildArg("build")...)
grunt(gruntBuildArg("package")...)
if goos == linux {
createLinuxPackages()
}
case "package-only":
grunt(gruntBuildArg("package")...)
if goos == linux {
createLinuxPackages()
}
@@ -139,9 +155,9 @@ func makeLatestDistCopies() {
}
latestMapping := map[string]string{
".deb": "dist/grafana_latest_amd64.deb",
".rpm": "dist/grafana-latest-1.x86_64.rpm",
".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
"_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",
}
for _, file := range files {
@@ -212,6 +228,10 @@ type linuxPackageOptions struct {
}
func createDebPackages() {
previousPkgArch := pkgArch
if pkgArch == "armv7" {
pkgArch = "armhf"
}
createPackage(linuxPackageOptions{
packageType: "deb",
homeDir: "/usr/share/grafana",
@@ -229,9 +249,17 @@ func createDebPackages() {
depends: []string{"adduser", "libfontconfig"},
})
pkgArch = previousPkgArch
}
func createRpmPackages() {
previousPkgArch := pkgArch
switch {
case pkgArch == "armv7":
pkgArch = "armhfp"
case pkgArch == "arm64":
pkgArch = "aarch64"
}
createPackage(linuxPackageOptions{
packageType: "rpm",
homeDir: "/usr/share/grafana",
@@ -249,6 +277,7 @@ func createRpmPackages() {
depends: []string{"/sbin/service", "fontconfig", "freetype", "urw-fonts"},
})
pkgArch = previousPkgArch
}
func createLinuxPackages() {
@@ -286,19 +315,34 @@ func createPackage(options linuxPackageOptions) {
"-s", "dir",
"--description", "Grafana",
"-C", packageRoot,
"--vendor", "Grafana",
"--url", "https://grafana.com",
"--license", "\"Apache 2.0\"",
"--maintainer", "contact@grafana.com",
"--config-files", options.initdScriptFilePath,
"--config-files", options.etcDefaultFilePath,
"--config-files", options.systemdServiceFilePath,
"--after-install", options.postinstSrc,
"--name", "grafana",
"--version", linuxPackageVersion,
"-p", "./dist",
}
name := "grafana"
if enterprise {
name += "-enterprise"
args = append(args, "--replaces", "grafana")
}
args = append(args, "--name", name)
description := "Grafana"
if enterprise {
description += " Enterprise"
}
args = append(args, "--vendor", description)
if !enterprise {
args = append(args, "--license", "\"Apache 2.0\"")
}
if options.packageType == "rpm" {
args = append(args, "--rpm-posttrans", "packaging/rpm/control/posttrans")
}
@@ -326,20 +370,6 @@ func createPackage(options linuxPackageOptions) {
runPrint("fpm", append([]string{"-t", options.packageType}, args...)...)
}
func verifyGitRepoIsClean() {
rs, err := runError("git", "ls-files", "--modified")
if err != nil {
log.Fatalf("Failed to check if git tree was clean, %v, %v\n", string(rs), err)
return
}
count := len(string(rs))
if count > 0 {
log.Fatalf("Git repository has modified files, aborting")
}
log.Println("Git repository is clean")
}
func ensureGoPath() {
if os.Getenv("GOPATH") == "" {
cwd, err := os.Getwd()
@@ -352,12 +382,8 @@ func ensureGoPath() {
}
}
func ChangeWorkingDir(dir string) {
os.Chdir(dir)
}
func grunt(params ...string) {
if runtime.GOOS == "windows" {
if runtime.GOOS == windows {
runPrint(`.\node_modules\.bin\grunt`, params...)
} else {
runPrint("./node_modules/.bin/grunt", params...)
@@ -377,6 +403,8 @@ func gruntBuildArg(task string) []string {
if phjsToRelease != "" {
args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
}
args = append(args, fmt.Sprintf("--platform=%v", goos))
return args
}
@@ -391,8 +419,13 @@ func test(pkg string) {
}
func build(binaryName, pkg string, tags []string) {
binary := "./bin/" + binaryName
if goos == "windows" {
binary := fmt.Sprintf("./bin/%s-%s/%s", goos, goarch, binaryName)
if isDev {
//don't include os and arch in output path in dev environment
binary = fmt.Sprintf("./bin/%s", binaryName)
}
if goos == windows {
binary += ".exe"
}
@@ -413,6 +446,7 @@ func build(binaryName, pkg string, tags []string) {
if !isDev {
setBuildEnv()
runPrint("go", "version")
fmt.Printf("Targeting %s/%s\n", goos, goarch)
}
runPrint("go", args...)
@@ -455,6 +489,14 @@ func clean() {
func setBuildEnv() {
os.Setenv("GOOS", goos)
if goos == windows {
// require windows >=7
os.Setenv("CGO_CFLAGS", "-D_WIN32_WINNT=0x0601")
}
if goarch != "amd64" || goos != linux {
// needed for all other archs
cgo = true
}
if strings.HasPrefix(goarch, "armv") {
os.Setenv("GOARCH", "arm")
os.Setenv("GOARM", goarch[4:])
@@ -464,15 +506,12 @@ func setBuildEnv() {
if goarch == "386" {
os.Setenv("GO386", "387")
}
if cgo != "" {
os.Setenv("CGO_ENABLED", cgo)
if cgo {
os.Setenv("CGO_ENABLED", "1")
}
if gocc != "" {
os.Setenv("CC", gocc)
}
if gocxx != "" {
os.Setenv("CXX", gocxx)
}
}
func getGitSha() string {
@@ -492,24 +531,6 @@ func buildStamp() int64 {
return s
}
func buildArch() string {
os := goos
if os == "darwin" {
os = "macosx"
}
return fmt.Sprintf("%s-%s", os, goarch)
}
func run(cmd string, args ...string) []byte {
bs, err := runError(cmd, args...)
if err != nil {
log.Println(cmd, strings.Join(args, " "))
log.Println(string(bs))
log.Fatal(err)
}
return bytes.TrimSpace(bs)
}
func runError(cmd string, args ...string) ([]byte, error) {
ecmd := exec.Command(cmd, args...)
bs, err := ecmd.CombinedOutput()

View File

@@ -1,11 +0,0 @@
coverage:
precision: 2
round: down
range: "50...100"
status:
project: yes
patch: yes
changes: no
comment: off

View File

@@ -14,6 +14,9 @@ instance_name = ${HOSTNAME}
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
data = data
# Temporary files in `data` directory older than given duration will be removed
temp_data_lifetime = 24h
# Directory where grafana can store logs
logs = data/log
@@ -210,6 +213,9 @@ allow_org_create = false
# Set to true to automatically assign new users to the default organization (id 1)
auto_assign_org = true
# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
auto_assign_org_id = 1
# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
auto_assign_org_role = Viewer
@@ -237,6 +243,9 @@ disable_login_form = false
# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
disable_signout_menu = false
# URL to redirect the user to after sign out
signout_redirect_url =
#################################### Anonymous Auth ######################
[auth.anonymous]
# enable anonymous access
@@ -261,6 +270,18 @@ api_url = https://api.github.com/user
team_ids =
allowed_organizations =
#################################### GitLab Auth #########################
[auth.gitlab]
enabled = false
allow_sign_up = true
client_id = some_id
client_secret = some_secret
scopes = api
auth_url = https://gitlab.com/oauth/authorize
token_url = https://gitlab.com/oauth/token
api_url = https://gitlab.com/api/v4
allowed_groups =
#################################### Google Auth #########################
[auth.google]
enabled = false
@@ -300,11 +321,16 @@ allow_sign_up = true
client_id = some_id
client_secret = some_secret
scopes = user:email
email_attribute_name = email:primary
auth_url =
token_url =
api_url =
team_ids =
allowed_organizations =
tls_skip_verify_insecure = false
tls_client_cert =
tls_client_key =
tls_client_ca =
#################################### Basic Auth ##########################
[auth.basic]
@@ -318,6 +344,7 @@ header_property = username
auto_sign_up = true
ldap_sync_ttl = 60
whitelist =
headers =
#################################### Auth LDAP ###########################
[auth.ldap]
@@ -442,6 +469,21 @@ enabled = true
# Makes it possible to turn off alert rule execution but alerting UI is visible
execute_alerts = true
# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
error_or_timeout = alerting
# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
nodata_or_nullvalues = no_data
# Alert notifications can include images, but rendering many images at the same time can overload the server
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
concurrent_render_limit = 5
#################################### Explore #############################
[explore]
# Enable the Explore section
enabled = false
#################################### Internal Grafana Metrics ############
# Metrics available at HTTP API Url /metrics
[metrics]
@@ -508,3 +550,8 @@ container_name =
[external_image_storage.local]
# does not require any configuration
[rendering]
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
server_url =
callback_url =

View File

@@ -15,6 +15,9 @@ start_tls = false
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"
# Authentication against LDAP servers requiring client certificates
# client_cert = "/path/to/client.crt"
# client_key = "/path/to/client.key"
# Search user bind dn
bind_dn = "cn=admin,dc=grafana,dc=org"
@@ -28,37 +31,11 @@ search_filter = "(cn=%s)"
# An array of base dns to search through
search_base_dns = ["dc=grafana,dc=org"]
# 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)
## For Posix or LDAP setups that does not support member_of attribute you can define the below settings
## Please check grafana LDAP docs for examples
# 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"]
# group_search_filter_user_attribute = "uid"
# Specify names of the ldap attributes your ldap uses
[servers.attributes]
@@ -72,6 +49,8 @@ email = "email"
[[servers.group_mappings]]
group_dn = "cn=admins,dc=grafana,dc=org"
org_role = "Admin"
# To make user an instance admin (Grafana Admin) uncomment line below
# grafana_admin = true
# The Grafana organization database id, optional, if left out the default org (id 1) will be used
# org_id = 1

View File

@@ -40,11 +40,14 @@ apiVersion: 1
# graphiteVersion: "1.1"
# tlsAuth: true
# tlsAuthWithCACert: true
# httpHeaderName1: "Authorization"
# # <string> json object of data that will be encrypted.
# secureJsonData:
# tlsCACert: "..."
# tlsClientCert: "..."
# tlsClientKey: "..."
# # <openshift\kubernetes token example>
# httpHeaderValue1: "Bearer xf5yhfkpsnmgo"
# version: 1
# # <bool> allow users to edit datasources from the UI.
# editable: false

View File

@@ -14,6 +14,9 @@
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
;data = /var/lib/grafana
# Temporary files in `data` directory older than given duration will be removed
;temp_data_lifetime = 24h
# Directory where grafana can store logs
;logs = /var/log/grafana
@@ -217,6 +220,9 @@ log_queries =
# Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false
;disable_signout_menu = false
# URL to redirect the user to after sign out
;signout_redirect_url =
#################################### Anonymous Auth ##########################
[auth.anonymous]
# enable anonymous access
@@ -266,6 +272,10 @@ log_queries =
;api_url = https://foo.bar/user
;team_ids =
;allowed_organizations =
;tls_skip_verify_insecure = false
;tls_client_cert =
;tls_client_key =
;tls_client_ca =
#################################### Grafana.com Auth ####################
[auth.grafana_com]
@@ -284,6 +294,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]
@@ -377,6 +388,21 @@ log_queries =
# Makes it possible to turn off alert rule execution but alerting UI is visible
;execute_alerts = true
# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
;error_or_timeout = alerting
# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
;nodata_or_nullvalues = no_data
# Alert notifications can include images, but rendering many images at the same time can overload the server
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
;concurrent_render_limit = 5
#################################### Explore #############################
[explore]
# Enable the Explore section
;enabled = false
#################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /metrics
[metrics]
@@ -410,7 +436,7 @@ log_queries =
;sampler_param = 1
#################################### Grafana.com integration ##########################
# Url used to to import dashboards directly from Grafana.com
# Url used to import dashboards directly from Grafana.com
[grafana_com]
;url = https://grafana.com
@@ -445,3 +471,8 @@ log_queries =
[external_image_storage.local]
# does not require any configuration
[rendering]
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
;server_url =
;callback_url =

16
devenv/README.md Normal file
View File

@@ -0,0 +1,16 @@
This folder contains useful scripts and configuration for...
* Configuring dev datasources in Grafana
* Configuring dev & test scenarios dashboards.
```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.
# 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.

View File

@@ -0,0 +1,9 @@
apiVersion: 1
providers:
- name: 'Bulk dashboards'
folder: 'Bulk dashboards'
type: file
options:
path: devenv/bulk-dashboards

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,9 @@
apiVersion: 1
providers:
- name: 'Bulk alerting dashboards'
folder: 'Bulk alerting dashboards'
type: file
options:
path: devenv/bulk_alerting_dashboards

View File

@@ -0,0 +1,168 @@
{
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"links": [],
"panels": [
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
65
],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"frequency": "10s",
"handler": 1,
"name": "bulk alerting",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-prometheus",
"fill": 1,
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 0
},
"id": 2,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"$$hashKey": "object:117",
"expr": "go_goroutines",
"format": "time_series",
"intervalFactor": 1,
"refId": "A"
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 50
}
],
"timeFrom": null,
"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
}
]
}
],
"schemaVersion": 16,
"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": "New dashboard",
"uid": null,
"version": 0
}

View File

@@ -1,13 +1,13 @@
#!/bin/bash
blocks_dir=blocks
blocks_dir=docker/blocks
docker_dir=docker
template_dir=templates
grafana_config_file=conf.tmp
grafana_config=config
compose_header_file=compose_header.yml
compose_header_file=docker/compose_header.yml
fig_file=docker-compose.yaml
fig_config=docker-compose.yaml

9
devenv/dashboards.yaml Normal file
View File

@@ -0,0 +1,9 @@
apiVersion: 1
providers:
- name: 'gdev dashboards'
folder: 'gdev dashboards'
type: file
options:
path: devenv/dev-dashboards

104
devenv/datasources.yaml Normal file
View File

@@ -0,0 +1,104 @@
apiVersion: 1
datasources:
- name: gdev-graphite
type: graphite
access: proxy
url: http://localhost:8080
jsonData:
graphiteVersion: "1.1"
- name: gdev-prometheus
type: prometheus
access: proxy
isDefault: true
url: http://localhost:9090
- name: gdev-testdata
type: testdata
- name: gdev-influxdb
type: influxdb
access: proxy
database: site
user: grafana
password: grafana
url: http://localhost:8086
jsonData:
timeInterval: "15s"
- name: gdev-opentsdb
type: opentsdb
access: proxy
url: http://localhost:4242
jsonData:
tsdbResolution: 1
tsdbVersion: 1
- name: gdev-elasticsearch-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
url: http://localhost:9200
jsonData:
interval: Daily
timeField: "@timestamp"
- name: gdev-mysql
type: mysql
url: localhost:3306
database: grafana
user: grafana
password: password
- name: gdev-mysql-ds-tests
type: mysql
url: localhost:3306
database: grafana_ds_tests
user: grafana
password: password
- name: gdev-mssql
type: mssql
url: localhost:1433
database: grafana
user: grafana
secureJsonData:
password: Password!
- name: gdev-mssql-ds-tests
type: mssql
url: localhost:1433
database: grafanatest
user: grafana
secureJsonData:
password: Password!
- name: gdev-postgres
type: postgres
url: localhost:5432
database: grafana
user: grafana
secureJsonData:
password: password
jsonData:
sslmode: "disable"
- name: gdev-postgres-ds-tests
type: postgres
url: localhost:5432
database: grafanadstest
user: grafanatest
secureJsonData:
password: grafanatest
jsonData:
sslmode: "disable"
- name: gdev-cloudwatch
type: cloudwatch
editable: true
jsonData:
authType: credentials
defaultRegion: eu-west-2

View File

@@ -1,40 +1,4 @@
{
"__inputs": [
{
"name": "DS_MSSQL",
"label": "MSSQL",
"description": "",
"type": "datasource",
"pluginId": "mssql",
"pluginName": "MSSQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mssql",
"name": "MSSQL",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": {
"list": [
{
@@ -52,8 +16,7 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1520976748896,
"iteration": 1532618661457,
"links": [],
"panels": [
{
@@ -63,7 +26,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -149,14 +112,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fill": 2,
"gridPos": {
"h": 18,
@@ -234,14 +201,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -313,11 +284,15 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [],
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fontSize": "100%",
"gridPos": {
"h": 10,
@@ -371,13 +346,13 @@
],
"schemaVersion": 16,
"style": "dark",
"tags": [],
"tags": ["gdev", "mssql", "fake-data-gen"],
"templating": {
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"hide": 0,
"includeAll": false,
"label": "Datacenter",
@@ -387,6 +362,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -397,7 +373,7 @@
{
"allValue": null,
"current": {},
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"hide": 0,
"includeAll": true,
"label": "Hostname",
@@ -407,6 +383,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -499,6 +476,7 @@
],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2,
"skipUrlSync": false,
"type": "interval"
}
]
@@ -533,7 +511,7 @@
]
},
"timezone": "",
"title": "Grafana Fake Data Gen - MSSQL",
"title": "Datasource tests - MSSQL",
"uid": "86Js1xRmk",
"version": 11
"version": 1
}

View File

@@ -1,40 +1,4 @@
{
"__inputs": [
{
"name": "DS_MYSQL",
"label": "MySQL",
"description": "",
"type": "datasource",
"pluginId": "mysql",
"pluginName": "MySQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mysql",
"name": "MySQL",
"version": "5.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": {
"list": [
{
@@ -52,8 +16,7 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1523372133566,
"iteration": 1532620738041,
"links": [],
"panels": [
{
@@ -63,7 +26,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -161,7 +124,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fill": 2,
"gridPos": {
"h": 18,
@@ -251,7 +214,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -332,7 +295,7 @@
},
{
"columns": [],
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fontSize": "100%",
"gridPos": {
"h": 9,
@@ -390,6 +353,7 @@
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"fake-data-gen",
"mysql"
],
@@ -397,8 +361,11 @@
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_MYSQL}",
"current": {
"text": "America",
"value": "America"
},
"datasource": "gdev-mysql",
"hide": 0,
"includeAll": false,
"label": "Datacenter",
@@ -408,6 +375,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -417,8 +385,11 @@
},
{
"allValue": null,
"current": {},
"datasource": "${DS_MYSQL}",
"current": {
"text": "All",
"value": "$__all"
},
"datasource": "gdev-mysql",
"hide": 0,
"includeAll": true,
"label": "Hostname",
@@ -428,6 +399,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -520,6 +492,7 @@
],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2,
"skipUrlSync": false,
"type": "interval"
}
]
@@ -554,7 +527,7 @@
]
},
"timezone": "",
"title": "Grafana Fake Data Gen - MySQL",
"title": "Datasource tests - MySQL",
"uid": "DGsCac3kz",
"version": 8
}

View File

@@ -1,40 +1,4 @@
{
"__inputs": [
{
"name": "DS_POSTGRESQL",
"label": "PostgreSQL",
"description": "",
"type": "datasource",
"pluginId": "postgres",
"pluginName": "PostgreSQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "datasource",
"id": "postgres",
"name": "PostgreSQL",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": ""
}
],
"annotations": {
"list": [
{
@@ -52,8 +16,7 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1518601837383,
"iteration": 1532620601931,
"links": [],
"panels": [
{
@@ -63,7 +26,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fill": 2,
"gridPos": {
"h": 9,
@@ -150,14 +113,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fill": 2,
"gridPos": {
"h": 18,
@@ -236,14 +203,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fill": 2,
"gridPos": {
"h": 9,
@@ -316,11 +287,15 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [],
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fontSize": "100%",
"gridPos": {
"h": 9,
@@ -377,6 +352,7 @@
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"fake-data-gen",
"postgres"
],
@@ -384,8 +360,11 @@
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_POSTGRESQL}",
"current": {
"text": "America",
"value": "America"
},
"datasource": "gdev-postgres",
"hide": 0,
"includeAll": false,
"label": "Datacenter",
@@ -395,6 +374,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -404,8 +384,11 @@
},
{
"allValue": null,
"current": {},
"datasource": "${DS_POSTGRESQL}",
"current": {
"text": "All",
"value": "$__all"
},
"datasource": "gdev-postgres",
"hide": 0,
"includeAll": true,
"label": "Hostname",
@@ -415,6 +398,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -507,6 +491,7 @@
],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2,
"skipUrlSync": false,
"type": "interval"
}
]
@@ -541,7 +526,7 @@
]
},
"timezone": "",
"title": "Grafana Fake Data Gen - PostgreSQL",
"title": "Datasource tests - Postgres",
"uid": "JYola5qzz",
"version": 1
"version": 4
}

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,574 @@
{
"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": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 0,
"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": "postfix",
"postfixFontSize": "50%",
"prefix": "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": true
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,2,3,4,5"
}
],
"thresholds": "5,10",
"title": "prefix 3 ms (green) postfixt + sparkline",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#d44a3a",
"rgba(237, 129, 40, 0.89)",
"#299c46"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 8,
"y": 0
},
"id": 3,
"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": "50%",
"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": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,2,3,4,5"
}
],
"thresholds": "5,10",
"title": "3 ms (red) + full height sparkline",
"type": "singlestat",
"valueFontSize": "200%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": true,
"colorPrefix": false,
"colorValue": false,
"colors": [
"#d44a3a",
"rgba(237, 129, 40, 0.89)",
"#299c46"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 16,
"y": 0
},
"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": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,2,3,4,5"
}
],
"thresholds": "5,10",
"title": "3 ms + red background",
"type": "singlestat",
"valueFontSize": "200%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 150,
"minValue": 0,
"show": true,
"thresholdLabels": true,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 0,
"y": 7
},
"id": 5,
"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": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "10,20,80"
}
],
"thresholds": "81,90",
"title": "80 ms green gauge, thresholds 81, 90",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "current"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 150,
"minValue": 0,
"show": true,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 8,
"y": 7
},
"id": 6,
"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": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "10,20,80"
}
],
"thresholds": "81,90",
"title": "80 ms green gauge, thresholds 81, 90, no labels",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "current"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 150,
"minValue": 0,
"show": true,
"thresholdLabels": false,
"thresholdMarkers": false
},
"gridPos": {
"h": 7,
"w": 8,
"x": 16,
"y": 7
},
"id": 7,
"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": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "10,20,80"
}
],
"thresholds": "81,90",
"title": "80 ms green gauge, thresholds 81, 90, no markers or labels",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "current"
}
],
"refresh": false,
"revision": 8,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"templating": {
"list": []
},
"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": "browser",
"title": "Panel Tests - Singlestat",
"uid": "singlestat",
"version": 14
}

View File

@@ -0,0 +1,453 @@
{
"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": [
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 11,
"w": 12,
"x": 0,
"y": 0
},
"id": 3,
"links": [],
"pageSize": 10,
"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.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"
],
"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)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"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": "server1",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,20,10"
},
{
"alias": "server2",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0"
}
],
"title": "Time series to rows (2 pages)",
"transform": "timeseries_to_rows",
"type": "table"
},
{
"columns": [
{
"text": "Avg",
"value": "avg"
},
{
"text": "Max",
"value": "max"
},
{
"text": "Current",
"value": "current"
}
],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 11,
"w": 12,
"x": 12,
"y": 0
},
"id": 4,
"links": [],
"pageSize": 10,
"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.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"
],
"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)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"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": "server1",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,20,10"
},
{
"alias": "server2",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0"
}
],
"title": "Time series aggregations",
"transform": "timeseries_aggregations",
"type": "table"
},
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 11
},
"id": 5,
"links": [],
"pageSize": null,
"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": "row",
"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"
],
"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)"
],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"alias": "ColorValue",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,20,10"
}
],
"title": "color row by threshold",
"transform": "timeseries_to_columns",
"type": "table"
},
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 18
},
"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": "Time",
"type": "date"
},
{
"alias": "",
"colorMode": "cell",
"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"
],
"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)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"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": "1,20,90,30,5,0,20,10"
},
{
"alias": "ColorCell",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "5,1,2,3,4,5,10,20"
}
],
"title": "Column style thresholds & units",
"transform": "timeseries_to_columns",
"type": "table"
}
],
"refresh": false,
"revision": 8,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"templating": {
"list": []
},
"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": "browser",
"title": "Panel Tests - Table",
"uid": "pttable",
"version": 1
}

View File

@@ -1,6 +1,6 @@
{
"revision": 2,
"title": "TestData - Alerts",
"title": "Alerting with TestData",
"tags": [
"grafana-test"
],
@@ -48,7 +48,7 @@
},
"aliasColors": {},
"bars": false,
"datasource": "Grafana TestData",
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
@@ -161,7 +161,7 @@
},
"aliasColors": {},
"bars": false,
"datasource": "Grafana TestData",
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,

View File

@@ -2,8 +2,8 @@
# http://localhost:3000 (Grafana running locally)
#
# Please note that you'll need to change the root_url in the Grafana configuration:
# root_url = %(protocol)s://%(domain)s:/grafana/
# root_url = %(protocol)s://%(domain)s:10081/grafana/
apacheproxy:
build: blocks/apache_proxy
build: docker/blocks/apache_proxy
network_mode: host

View File

@@ -1,5 +1,5 @@
collectd:
build: blocks/collectd
build: docker/blocks/collectd
environment:
HOST_NAME: myserver
GRAPHITE_HOST: graphite

View File

@@ -0,0 +1,15 @@
# 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
command: elasticsearch
ports:
- "11200:9200"
- "11300:9300"
fake-elastic6-data:
image: grafana/fake-data-gen
network_mode: bridge
environment:
FD_DATASOURCE: elasticsearch6
FD_PORT: 11200

View File

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

View File

@@ -1,5 +1,5 @@
graphite09:
build: blocks/graphite
build: docker/blocks/graphite
ports:
- "8080:80"
- "2003:2003"

View File

@@ -8,7 +8,7 @@
# 'avg'. The name of the aggregate metric will be derived from
# 'output_template' filling in any captured fields from 'input_pattern'.
#
# For example, if you're metric naming scheme is:
# For example, if your metric naming scheme is:
#
# <env>.applications.<app>.<server>.<metric>
#

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