IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 00:25:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,642 Commits 5,445 Branches 554 Tags 1.9 GiB
306c3e6c10
Commit Graph

6575 Commits

Author SHA1 Message Date
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
82c473e3af document $__timeGroupAlias 2018-08-01 21:23:00 +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
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
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
43295f9c18 remove alias from postgres $__timeGroup macro 2018-08-01 08:50:19 +02:00
Torkel Ödegaard
89eae1566d fix: team email tooltip was not showing 2018-07-31 17:31:45 +02:00
Patrick O'Carroll
4b8ec4e323 removed a blank space in div 2018-07-31 13:07:43 +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
Tobias Skarhed
e4c2476f3c Weird execution order for the tests... 2018-07-31 09:35:08 +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
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
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
Tobias Skarhed
3d4a346c66 Begin conversion 2018-07-30 13:02:08 +02:00
Marcus Efraimsson
20b2b344f6
mssql: add logo 2018-07-28 11:31:30 +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
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
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
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
Tobias Skarhed
67c613a45a Begin conversion 2018-07-27 13:29:57 +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
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
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
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
Tobias Skarhed
7d51c15240 Two passing tests 2018-07-25 16:15:03 +02:00
Tobias Skarhed
f350461206 Start conversion 2018-07-25 14:52:03 +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
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
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
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
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
bb0af52d34 Figuring out why it doesn't initialize 2018-07-23 14:54:58 +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
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
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
Daniel Lee
5129ea8f87
Merge pull request #11624 from mtanda/cw_get_metric_data 
CloudWatch GetMetricData support
 2018-07-22 21:34:07 +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
a4587cdeee fix: datasource search was not working properly 2018-07-18 14:28:38 +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
Daniel Lee
3cb95fb40a pluginloader: expose flot gauge plugin 2018-07-18 12:05:45 +02: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
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
David Kaltschmidt
1f74b298c4 Remove string casting for template variables in prometheus 2018-07-16 13:02:36 +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
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
David Kaltschmidt
eb2abe800b Reverted $q to Promise migration in datasource_srv 2018-07-13 22:28:14 +02: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
David Kaltschmidt
390090da05 Set datasource in deep links to Explore 2018-07-13 09:45:56 +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
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 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
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
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
Tobias Skarhed
4ee4ca99be Prevent scroll on focus for iframe 2018-07-10 12:54:45 +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
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
Tobias Skarhed
e51f208a49 Cleanup and remove some jest.fn() 2018-07-09 15:42:34 +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
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
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
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
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
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
Marcus Efraimsson
5e4d6958d6
fix links not updating after changing variables 2018-07-06 11:54:37 +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
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
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
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
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
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
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
Marcus Efraimsson
845724e8b9
update mysql/mssql query/annotation help sections 2018-06-29 20:39:06 +02:00
bergquist
ce88e4b927 fixes typos 
closes #12453
 2018-06-29 09:35:31 +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
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
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
Tobias Skarhed
c2381f088f Add disabled styles for checked checkbox (#12422) 2018-06-28 03:02:49 -07:00
Marcus Efraimsson
9f02927761
login: fix layout issues 2018-06-26 15:19:57 +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
Aman
e11f6f5cdf
Make pre/postfix coloring checkboxes inactive when gauge is active 2018-06-26 13:06:26 +05:30
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
Tobias Skarhed
762ee203fa Fix 12248 2018-06-25 13:46:33 +02: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
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
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
Tobias Skarhed
d00e2c20cf Karma to Jest: history_ctrl. Update version: ts-jest 2018-06-20 15:25:57 +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
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
4ef4a4d3a7
dashboard: fix drop down links 2018-06-20 12:41:11 +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
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
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
a738347957
snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +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
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
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
David Kaltschmidt
d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01: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