Commit Graph

14770 Commits

Author SHA1 Message Date
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
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