IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 16:15:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,890 Commits 5,442 Branches 554 Tags 1.9 GiB
6564abd5f3
Commit Graph

7312 Commits

Author SHA1 Message Date
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
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
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
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
Daniel Lee
66c95991c1 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-26 17:59:56 +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
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
Erik Sundell
af9033f3e0 stackdriver: distinct grafana auto from stackdriver auto in alignment period 2018-09-26 15:44:09 +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
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
Daniel Lee
0a77cd5569 stackdriver: adds on-change with debounce for alias by field 2018-09-26 00:33:18 +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
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
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
Axel Pirek
d2f2c3f220 Fix spelling of your and you're 2018-09-25 12:38:02 +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
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
Patrick O'Carroll
daffa7d067 removed border, cleaned up css and fixed class naming 2018-09-24 12:49:29 +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
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
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
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
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
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
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
785f35b1c9 Merge branch 'master' of github.com:grafana/grafana 2018-09-21 09:24:03 +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
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
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
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
Daniel Lee
e05b86375b stackdriver: remove hardcoding of test project name 2018-09-18 16:02:38 +02:00
Erik Sundell
7b8ea5fc54 stackdriver: improve query look 2018-09-17 17:34:01 +02:00
Erik Sundell
cfb8017567 stackdriver: add alignment period to query controller 2018-09-17 17:16:14 +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
Erik Sundell
f243da756b stackdriver: fix init labels bug 2018-09-17 11:28:10 +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
b2833daf32
Merge pull request #13285 from marefr/team_member_ext 
Team member labels
 2018-09-17 09:14:06 +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
3f309ff5dd rename folder 2018-09-15 04:50:22 -07: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
Marcus Efraimsson
da68b858d7
display team member labels 2018-09-14 17:28:34 +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
Erik Sundell
fa6e31c6d5 stackdriver: adds null check to query 2018-09-14 17:01:27 +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
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
Erik Sundell
9b4a25ed21 stackdriver: fixes remove option in filter 2018-09-14 11:24:02 +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
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
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
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
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
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
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
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
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
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
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
834d06c35b Build new stackdriver frontend script 2018-09-14 09:33:50 +02:00
Erik Sundell
f0f19e0c03 Adds stackdriver frontend skeleton 2018-09-14 09:33:50 +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
Torkel Ödegaard
fbfcc62269
fix: added loading screen error scenario (#13256) 2018-09-13 21:08:41 +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
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
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
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
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
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
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
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
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
Torkel Ödegaard
9cfe2a7f5c fix: Dashboard permissions now shows correctly, fixes #13201 2018-09-10 11:35:59 +02:00
Torkel Ödegaard
267b96cb48 Merge branch 'master' of github.com:grafana/grafana 2018-09-10 09:54:30 +02:00
Torkel Ödegaard
5c58a7d7f4 redux: do not use redux logger middleware in production builds 2018-09-10 09:53:52 +02:00
Sven Klemm
7c78b64a36 Document required order for time series queries (#13204) 2018-09-10 09:33: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
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
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
Alexander Zobnin
a186bc01e0
tests for withScrollBar() wrapper 2018-09-06 15:37:31 +03: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
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
bergquist
3ce89cad71 make default values for alerting configurable 2018-09-06 11:26:14 +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
Peter Holmberg
7e340b7aa5 delete team 2018-09-05 15:32:51 +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
Peter Holmberg
306c3e6c10 creating types, actions, reducer 2018-09-05 12:34:32 +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
Torkel Ödegaard
00c0b71f3d Merge branch '12918-only-arrow-functions4' 2018-09-05 11:46:54 +02:00
Torkel Ödegaard
432e203df1 Merge branch '12918-only-arrow-functions3' 2018-09-05 11:26:30 +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
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
Marcus Efraimsson
1e74d7f20a
handle new variables created not yet added 2018-09-04 13:25:44 +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
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
Carl Bergquist
2f6af7b811
Merge pull request #13125 from overcookedpanda/master 
added Bitcoin as a currency option
 2018-09-04 11:07:49 +02:00