Commit Graph

2012 Commits

Author SHA1 Message Date
SamuelToh
a7a964ec19 Added PATCH verb end point for annotation op
Added new PATCH verb annotation endpoint

Removed unwanted fmt

Added test cases for PATCH verb annotation endpoint

Fixed formatting issue

Check arr len before proceeding

Updated doc to include PATCH verb annotation endpt
2019-02-05 09:43:17 +10:00
Torkel Ödegaard
ab812e73f6 Updated what's new article 2019-01-31 07:47:55 +01:00
Thomas Rohlik
e83831904a
Fix anchor 2019-01-30 18:52:40 +01:00
Torkel Ödegaard
e3472f6d81 Added download links to docs 2019-01-30 17:53:41 +01:00
Torkel Ödegaard
b8427ba379 Updated docs 2019-01-30 17:28:43 +01:00
Torkel Ödegaard
d7f81c4795 Updated version and made some changes to changelog and what's new article 2019-01-30 17:14:42 +01:00
Torkel Ödegaard
3ad48ff7e5 docs: Added version notice for time range variables 2019-01-30 16:54:09 +01:00
Torkel Ödegaard
b32c3a9d84 Merge branch 'whatsnew-6-0' 2019-01-30 16:52:22 +01:00
Torkel Ödegaard
70c35d646f Added loki video 2019-01-30 16:51:59 +01:00
Torkel Ödegaard
26096c65a5 spell fixes 2019-01-30 16:15:56 +01:00
Torkel Ödegaard
8aed401640 Updated explore section again 2019-01-30 14:47:23 +01:00
Torkel Ödegaard
5fa8c53d2e Updated explore section 2019-01-30 14:44:35 +01:00
Torkel Ödegaard
2ca34376a0 fixe merge issue 2019-01-30 14:33:49 +01:00
Torkel Ödegaard
5b67ebde0c Merge branch 'whatsnew-6-0' of github.com:grafana/grafana into whatsnew-6-0 2019-01-30 14:23:40 +01:00
Torkel Ödegaard
909acb08ef updated what's new article 2019-01-30 14:17:34 +01:00
Daniel Lee
3bb5930c54 docs: whats new tweaks 2019-01-30 11:16:26 +01:00
Torkel Ödegaard
7dc3303e05 Merge branch 'whatsnew-6-0' of github.com:grafana/grafana into whatsnew-6-0 2019-01-30 11:14:51 +01:00
Torkel Ödegaard
ce617bc02e Minor updates to text and image placements 2019-01-30 11:12:07 +01:00
Daniel Lee
0b971d48c2 docs: add video link to what's new 2019-01-30 11:11:27 +01:00
bergquist
445b427fb6 whats new: note about session storage 2019-01-30 10:52:42 +01:00
bergquist
dfd87c3b93 whats new: provisioning for alert notifiers 2019-01-30 09:54:08 +01:00
Daniel Lee
368494bb16 docs: update to what's new 2019-01-30 00:25:32 +01:00
Daniel Lee
13579b76d9 docs: wip - what's new for 6.0 2019-01-29 23:51:16 +01:00
Torkel Ödegaard
77bb3ddf62 Added basic docs 2019-01-29 20:53:49 +01:00
Carl Bergquist
c6f80ecec2
Merge pull request #14229 from pbakulev/configurable-alert-notification
Configurable alert notification
2019-01-28 22:47:12 +01:00
bergquist
e218cc7637 docs: updates docs to refer to using uid 2019-01-28 22:03:16 +01:00
bergquist
8f0e65a150 renames alert_notifications -> notifiers 2019-01-28 20:39:09 +01:00
Marcus Efraimsson
7023c957d7
Merge branch 'master' into nanosecond-postgresql 2019-01-28 20:04:46 +01:00
bergquist
6a8643b3d1 Merge branch 'master' into configurable-alert-notification
* master: (250 commits)
  Firing off an action instead of listening to location changes
  Changes after PR Comments
  Made ExplorerToolbar connected and refactored away responsabilities from Explore
  Removed some split complexity
  Fixed some more styling
  Fixed close split look and feel
  Fixed position of Closesplit
  Fixed small issue with TimePicker dropdown position
  Simplified some styles and dom elements
  Fixed some more with the sidemenu open and smaller screens
  Fixed so heading looks good with closed sidemenu
  Restructure of component and styling
  Refactored out ExploreToolbar from Explore
  Fixed reinitialise of Explore
  changelog: add notes about closing #13929
  changelog: add notes about closing #14558
  changelog: add notes about closing #14484
  changelog: add notes about closing #13765
  changelog: add notes about closing #11503
  changelog: add notes about closing #4075
  ...
2019-01-28 14:16:43 +01:00
Frank lin Piat
1fc5ea181a
Document /api/health
Document the health check implemented in #3302 (and #935), see  https://github.com/grafana/grafana/issues/3302#issuecomment-297066201
2019-01-25 17:52:28 +01:00
Torkel Ödegaard
81981cf45d
Merge pull request #15014 from grafana/docs-fix-updates-flag
added docs entry for check_for_updates config flag,
2019-01-23 19:35:12 +01:00
Torkel Ödegaard
d88b7608a5
Merge pull request #15013 from grafana/revert-11635-patch-1
Revert "Specify expected encoding for access/secret key"
2019-01-23 18:26:35 +01:00
Torkel Ödegaard
05a976fdb1 added docs entry for check_for_updates config flag, fixes ##14940 2019-01-23 18:24:57 +01:00
Torkel Ödegaard
db99b86591
Merge pull request #12765 from cxcv/master
added percentencode formatting option
2019-01-22 15:55:36 +01:00
Benjamin Schweizer
bde4b76c16 based on encodeURIComponent() using strict RFC 3986 sub-delims 2019-01-22 15:09:58 +01:00
Torkel Ödegaard
f0e61af8e0 Fixed issues with the sanitizie input in text panels, added docs, renamed config option 2019-01-22 11:56:35 +01:00
Benjamin Schweizer
8a09d84707 Merge branch 'master' of https://github.com/grafana/grafana 2019-01-22 11:20:56 +01:00
Torkel Ödegaard
4712a87733
Revert "Specify expected encoding for access/secret key" 2019-01-18 16:37:43 +01:00
flopp999
5f4e4a813d
change enabled to true
if it is false it will not work
2019-01-18 14:06:15 +01:00
Scott Brenner
a6a70db066
cloudwatch.md - quick typo fix
"you grafana" ➡️ "your Grafana"
2019-01-16 22:03:29 -08:00
Pavel Bakulev
f132e929ce Added uid for alert notifications 2019-01-16 16:50:00 +02:00
Pavel Bakulev
5c10a897f8 Instantiating notifiers from config before using 2019-01-16 16:45:42 +02:00
Pavel Bakulev
e1b87fc597 Added parameter org_name of alert notification to documentation 2019-01-16 16:45:42 +02:00
Pavel Bakulev
6e3e9a337d Added alert_notification configuration 2019-01-16 16:45:42 +02:00
Daniel Lee
191f603459 docs: add a title to the Explore docs 2019-01-15 09:36:23 +01:00
Mohammed Salman Khan
aa799c6f0b
Fixed Syntax for folder permission's JSON 2019-01-14 10:53:16 -05:00
Pierre GIRAUD
a881497908
Max number of repeated panels per row
Instead of min width
2019-01-09 08:01:42 +01:00
Leonard Gram
023e496108 docs: rpm/deb beta repo. 2019-01-08 16:49:29 +01:00
Andrew Prokhorenkov
294fb7b3bc
fix JSON in responses for Admin API documentation 2019-01-06 16:57:44 -06:00
Leonard Gram
dd6f606cda docs: updated debian and centos repo. 2019-01-04 16:36:32 +01:00
Ander Arguiñano
49133b0012 Updated documentation for new macros 2019-01-04 14:36:07 +01:00
bergquist
74124ec8ed makes cache mode configurable
this makes the cache mode in the sqlite connection
string configurable. the default also changed from
shared to private to solve #107272 but allow the user
to use shared if performance is more important.

ref #10727
2018-12-27 10:48:11 +01:00
Jacob Richard
47c0b5770b Removing erroneous backtick in docs 2018-12-22 18:18:15 -06:00
Jacob Richard
b785b06598 Updating docs for auth_proxy whitelist CIDR support 2018-12-22 18:17:32 -06:00
Tomas Dabasinskas
e8823f71b0 Add documentation 2018-12-19 15:29:49 +02:00
Simon Mattila
c4126f9910
Update gitlab.md
Change title from Google to GitLab
2018-12-17 00:26:23 +01:00
Simon Mattila
5d190769e6
Update github.md
Change title from Google to GitHub
2018-12-17 00:24:52 +01:00
Daniel Lee
46565efc04 docs: fix broken link on explore page 2018-12-11 17:17:01 +01:00
Daniel Lee
d7ba9c1a54
Merge pull request #14325 from grafana/docs-explore
WIP docs for the new Explore feature
2018-12-11 16:45:35 +01:00
Daniel Lee
a2f4775b8d docs: explore
Documentation for the new Explore feature.

Describes both the Prometheus-specific features and the
Loki (logging) features.
2018-12-10 23:51:14 +01:00
bergquist
5d720674e3 Merge branch 'master' into add_google_hangouts_chat_notifier
* master: (322 commits)
  graphInterval needs to update after query execution, fixes #14364
  Explore: Parse initial dates
  Aligned styling of stats popover/box with rest of grafana & minor css refactoring
  Prometheus: Make result transformer more robust for empty responses
  Rebase fixes
  Explore: Logging line parsing and field stats
  fixed unit tests
  made unknown color theme aware and sync with graph color, some minor cleanup
  Explore: improve error handling
  use render props instead of cloneElement
  sort of a hacky way to figure if the small variation should be used for the label
  add basic button group component, using the the same label style as is
  explore logs styling
  wip: alternative level styling & hover effect
  wip: explore logs styling
  more detailed error message for loki
  If user login equals user email, only show the email once #14341
  UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons.  #14341
  wip: explore logs styling
  restoring monospace & making sure width are correct when hiding columns
  ...
2018-12-07 14:31:13 +01:00
Marcus Efraimsson
5c4b91c65e
new stable docs version 2018-12-03 12:16:08 +01:00
Carl Bergquist
3c8515bb77
Merge pull request #14220 from mjtrangoni/fix-misspell-issues
Fix misspelling issues using locale US
2018-12-03 09:18:46 +01:00
Marcus Efraimsson
624e5e5b3d
let each sql datasource handle timeFrom and timeTo macros 2018-11-30 14:30:02 +01:00
Mario Trangoni
5d60d323e2 docs/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e node_modules -e devenv -e unknwon | grep docs
2018-11-29 18:14:20 +01:00
Omar Alejandro González Rojina
804bd822d0
Update export_import.md
Grafana v5.3.4 shows a new checkbox in the export modal "Export for sharing externally". If the checkbox is not checked then the "__inputs" section wont be included into the exported JSON file, would be great to add that note into the documentation for others to avoid confusions.
2018-11-28 11:17:36 -06:00
Quentin Hartman
02a7916b26
Remove confusing <> from variable intro
The existing intro makes it look like you should use `$<varname>` to refer to a variable. That of course is incorrect, and you should use `$varname`. In my experience using the <> marker around variable names should only be used when there isn't something else explicit to set it off. In this case we have `$`. Below, you can see the <> are also not used, because we have the `[[]]` to set it off. The inconsistency is confusing.
2018-11-26 15:33:13 -07:00
Daniel Hollcraft
4a2e9b4bfa
chore: correct pause-all-alerts auth in docs 2018-11-26 09:43:26 -05:00
Marcus Efraimsson
46c6594744
Merge pull request #14163 from grafana/14155_whats_new
docs: what's new in v5.4
2018-11-26 05:28:57 -08:00
Marcus Efraimsson
df218961e0
docs: various fixes of what's new in v5.4 2018-11-23 14:45:32 +01:00
Marcus Efraimsson
9aa4d71550
docs: fix old ldap url redirect 2018-11-23 14:31:21 +01:00
Marcus Efraimsson
b55b9261f0
docs: what's new in v5.4 2018-11-23 11:15:53 +01:00
Marcus Efraimsson
5ebb201caa
docs: signout_redirect_url description in auth overview 2018-11-22 15:59:15 +01:00
Zhang Yong
4f236ca465
Fix a typo
Fix a typo
2018-11-22 15:17:31 +08:00
Marcus Efraimsson
f74a7cd97c
typos in docs/sources/alerting/rules.md
Co-Authored-By: bergquist <carl@grafana.com>
2018-11-21 14:41:51 +01:00
Marcus Efraimsson
fdbccdc347
typos in docs/sources/alerting/rules.md
Co-Authored-By: bergquist <carl@grafana.com>
2018-11-21 14:41:35 +01:00
bergquist
1491ea1c75 docs: adds example timeline for alerting for 2018-11-21 11:11:46 +01:00
bergquist
baba8a92ee update path to alerting for image 2018-11-20 17:09:21 +01:00
Marcus Efraimsson
8d75fcb6f7
what's new in v5.4 placeholder 2018-11-20 14:35:38 +01:00
Daniel Lee
4aeea56342
Merge pull request #14007 from grafana/stackdriver-template-query-editor
Stackdriver template query editor
2018-11-20 13:41:18 +01:00
Carl Bergquist
db8bd8298a
Merge pull request #14077 from bobmshannon/bs/metrics_endpoint_auth
Add basic authentication support to metrics endpoint
2018-11-20 11:19:55 +01:00
Marcus Efraimsson
9cc6c2128a
Merge pull request #14120 from supercharlesliu/user-teams
Add API GET /api/users/:id/teams for GrafanaAdmin
2018-11-20 00:56:35 -08:00
Leonard Gram
87707c964c Revert "docs: building Grafana on arm."
Further work-arounds are needed to make this work.
This reverts commit 8a2de58728.
2018-11-20 08:46:09 +01:00
supercharlesliu
a241f67fba Add doc for api "GET /api/users/:id/teams" 2018-11-20 10:17:46 +08:00
Leonard Gram
8a2de58728 docs: building Grafana on arm. 2018-11-19 16:50:19 +01:00
Erik Sundell
6aaaadac21 stackdriver: update docs 2018-11-19 14:48:26 +01:00
Carl Bergquist
6049855dc7
Merge pull request #13947 from bergquist/alerting_for
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Carl Bergquist
03ac9c5256
Merge pull request #12029 from Nick-Triller/11893_oauth_auto_login
11893 oauth auto login
2018-11-19 10:21:33 +01:00
Patrick
2de5a7119b
Merge branch 'master' into add_google_hangouts_chat_notifier 2018-11-18 22:00:53 +01:00
Patrick Schuster
481dcb321d Update ReadMe. 2018-11-16 00:30:51 +01:00
Marcus Efraimsson
0810aa2e60
Merge pull request #12371 from marefr/xaxis_thresholds
Time regions support in graph panel
2018-11-15 08:46:39 -08:00
Bob Shannon
dcc48860b8 Fix formatting and remove enabled toggle 2018-11-14 17:37:32 -05:00
Bob Shannon
362b3740ed Add basic authentication support to metrics endpoint 2018-11-14 16:27:41 -05:00
Marcus Efraimsson
dea953003c
docs: description about graph panel time regions feature 2018-11-14 18:47:35 +01:00
Marcus Efraimsson
33469ecfab
docs: team http api update 2018-11-14 17:59:32 +01:00
Erik Sundell
33411198ab
Update stackdriver.md 2018-11-09 14:19:41 +01:00
Erik Sundell
bdaa61a193 stackdriver: add documentation for the template query editor 2018-11-09 13:55:16 +01:00
bergquist
aa1b80fe45 docs: improve helper test for For 2018-11-08 14:16:58 +01:00
bergquist
975f0aa064 alerting: adds docs about the for setting 2018-11-08 13:52:06 +01:00
Marcus Efraimsson
662808f092
Merge pull request #13930 from grafana/enterprise-docs
docs: restructure and enhancement
2018-11-08 01:50:35 -08:00
Torkel Ödegaard
dcb5015022
Merge pull request #13951 from marefr/11977_6x_terms
Fix terms agg order deprecation warning on es 6+
2018-11-07 20:47:41 +01:00
Marcus Efraimsson
d7edc59882
minor fix 2018-11-07 13:52:11 +01:00
Alexandre de Verteuil
d0794dbce1
Update docs/sources/permissions/dashboard_folder_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-07 09:17:36 +01:00
Alexandre de Verteuil
1d3b8e25ce
Fix typo in docs/sources/reference/scripting.md
Change:
> In the folder grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
…to:
> In the grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
2018-11-06 15:41:37 -05:00
Marcus Efraimsson
f294dbdb86
move enterprise down in menu 2018-11-06 17:39:35 +01:00
Dan Cech
1347ce5f75
Update docs/sources/permissions/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:57:14 +01:00
Dan Cech
850c0e7111
Update docs/sources/permissions/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:53 +01:00
Dan Cech
4ef770fe98
Update docs/sources/permissions/dashboard_folder_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:32 +01:00
Dan Cech
1bc3f0af07
Update docs/sources/http_api/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:12 +01:00
Dan Cech
8a52cb7714
Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:53 +01:00
Dan Cech
d44b8968d2
Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:42 +01:00
Dan Cech
803b36a059
Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:28 +01:00
Dan Cech
5cdd53c5e7
Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:05 +01:00
Dan Cech
32e001dba4
Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:53 +01:00
Dan Cech
881c73fb93
Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:25 +01:00
Dan Cech
044505a213
minor change
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:53:49 +01:00
Carl Bergquist
f43f4a94a7
Merge pull request #13961 from mtanda/cw_doc_math
add minimal permission to docs
2018-11-05 09:10:36 +01:00
Mitsuhiro Tanda
cb2a03a08c add minimal permission 2018-11-05 14:27:27 +09:00
Ben Bodenmiller
d6cd2a2085
Gitlab -> GitLab 2018-11-04 00:48:30 -07:00
Marcus Efraimsson
5803bfd2c7
fix terms agg order deprecation warning on es 6+ 2018-11-02 17:53:47 +01:00
Matthew Miner
7e13aa2cfb Fix minor JSON typo in HTTP API docs 2018-11-01 10:05:26 -07:00
Torkel Ödegaard
4c070bc781 minor doc tweaks 2018-11-01 12:35:51 +01:00
Torkel Ödegaard
5a27df2dc9 updated enterprise page 2018-11-01 12:19:19 +01:00
Marcus Efraimsson
a1b4ebc115
make permission sub items in sidemenu cleaner 2018-11-01 11:00:32 +01:00
Marcus Efraimsson
280c8631f9
docs: enhanced ldap 2018-10-31 18:01:30 +01:00
Marcus Efraimsson
5495072c83
docs: fix datasource permissions keywords 2018-10-31 17:18:31 +01:00
Marcus Efraimsson
f348acccf3
Merge pull request #13758 from grafana/mysql_query_builder
mysql graphical query builder
2018-10-31 10:52:16 +01:00
Marcus Efraimsson
fc6d7c9b6b
datasource permission http api 2018-10-30 19:02:12 +01:00
Marcus Efraimsson
621525d10f
restructure administration/permissions page into a section with sub pages 2018-10-30 18:43:54 +01:00
Marcus Efraimsson
a00999fd89
docs: schema -> database 2018-10-30 16:25:36 +01:00
Marcus Efraimsson
00a997b7a8
docs: mysql 2018-10-30 15:45:39 +01:00
Torkel Ödegaard
a8e2840f15 minor progress 2018-10-30 15:25:10 +01:00
Torkel Ödegaard
e9928f6c52 Merge branch 'master' into enterprise-docs 2018-10-30 15:01:09 +01:00
Steve Kreitzer
e44dde3f14 Fixing issue 13855 2018-10-28 10:25:42 -04:00
bergquist
d9cd20e43e docs: improve ES provisioning examples
closes #12281
2018-10-25 14:36:31 +02:00
Yuan Liu
eb255520cb
fix dingding doc error 2018-10-24 22:28:59 +08:00
Marcus Efraimsson
758a5ecf51
docs: fix tutorials index page. Fixes #13799 2018-10-24 11:55:43 +02:00
Marcus Efraimsson
00d6707045
docs: fix tutorials index page. Fixes #13799 2018-10-24 11:21:34 +02:00
Erik Sundell
c5af0bf1c5 Resource type filter (#13784)
* stackdriver: add resource type to filter and group bys

* stackdriver: remove not used param

* stackdriver: refactor filter and group by code

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

* stackdriver: remove debug logging

* stackdriver: remove more debug logging

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

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

* stackdriver: format legend support for resource type

* stackdriver: add resource type to documentation

* stackdriver: not returning promise from query function

* stackdriver: fix refactoring bug

* stackdriver: remove not used import
2018-10-24 11:18:49 +02:00
Daniel Lee
693a3adc72
Merge pull request #13671 from grafana/gce-automatic-authentication
Stackdriver: Add possibility to authenticate using GCE metadata server
2018-10-22 18:46:54 +02:00
Marcus Efraimsson
ead6a051df
docs: update debian installation instructions 2018-10-22 18:31:31 +02:00
Daniel Lee
6e0728ad88 stackdriver: some tweaks to the text on the config page and in docs 2018-10-22 16:14:17 +02:00
Erik Sundell
a1fee2fd8a stackdriver: add provisioning example for gce authentication 2018-10-22 16:12:55 +02:00
Erik Sundell
0109051b2a stackdriver: add documentation for gce default account authentication 2018-10-22 16:12:22 +02:00
Erik Sundell
93a9885d67 stackdriver: add default project to provisioning documentation 2018-10-19 15:15:45 +02:00
Torkel Ödegaard
10d706dccf wip: enterprise docs 2018-10-18 14:34:25 +02:00
Leonard Gram
675bf00727
A list of where to make changes when upgrading Go and Node.js (#13693) 2018-10-17 16:39:03 +02:00
Leonard Gram
cd96ef3590 docs: installing custom plugins in docker.
[skip ci]
2018-10-17 14:34:40 +02:00
Nick Triller
6d0d07a55b Document oauth_auto_login setting 2018-10-17 13:49:43 +02:00
Marcus Efraimsson
62f21a254a
Merge pull request #12337 from mtanda/cw_regions
show all CloudWatch regions (avoid hard coding)
2018-10-17 11:55:43 +02:00
Marcus Efraimsson
518e485e36
docs: update cloudwatch iam policy description 2018-10-17 10:52:46 +02:00
Yuan Liu
7946a405f5
update doc due to client layout change 2018-10-17 10:24:05 +08:00
Marcus Efraimsson
3612a1c00e
Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option
Add encrypt setting to MSSQL data source.
2018-10-16 19:07:00 +02:00
Ramiro Morales
cf6faabd12 update, don't remove 'Known Issues' docs section. 2018-10-15 21:51:21 -03:00
Ramiro Morales
6a8d1c4546 update provisioning docs. 2018-10-15 21:46:26 -03:00
Erik Pettersson
25b68809b0
doc(documenation)
Use same name for Elasticsearch. The docs contained a mix of Elastic and Elasticsearch.
2018-10-15 23:35:47 +02:00
Ramiro Morales
37f16ca80a Add 'encrypt' setting to MSSQL data source.
Fixes #13629
2018-10-15 14:47:54 -03:00
steaksauce-
77856d090b Removed reference to plugin_api.md (SDK Readme) on the development page as the file that it points to no longer exists. This addresses an open issue on the grafana.org repo 2018-10-13 22:16:47 -05:00
i-ky
e950fa7983
fixed a typo 2018-10-13 01:15:16 +03:00
i-ky
7acea2a109
fixed a typo 2018-10-13 00:45:05 +03:00
Matthieu Rudelle
3aef519cdc grafana/grafana#13340 complete oauth doc 2018-10-11 21:22:02 +02:00
Marcus Efraimsson
90f6817f6f
docs: refer to v5.3 instead of v5.2 2018-10-11 16:36:28 +02:00
Daniel Lee
03fefd7bea docs: stackdriver fixes after review
- index page datasource order changed
- image links changed to the image box format
- incorrect sentence fixed
2018-10-11 15:42:47 +02:00
Daniel Lee
9f660a7b18 stackdriver docs: metric query editor and annotations 2018-10-11 14:42:34 +02:00
Marcus Efraimsson
bc3b7357bd
Merge pull request #13400 from connection-reset/concurrent-sql
Run queries for sql data sources for panels with multiple queries concurrently
Also make max open connections, max idle connections and max connection 
lifetime configurable in the data source settings
2018-10-10 19:12:38 +02:00
Marcus Efraimsson
4757ca2242
docs: add version notes 2018-10-10 18:59:09 +02:00
bergquist
cecf87571f set v5.3 as root docs 2018-10-10 14:00:51 +02:00
Daniel Lee
76ea12b5b0
Merge pull request #13403 from grafana/5.3-release-post
wip: whats new for 5.3
2018-10-10 13:58:32 +02:00
Daniel Lee
0a64f0bdc7 whatsnew: adds image for Stackdriver
Plus a few tweaks to the text
2018-10-10 13:46:10 +02:00
Daniel Lee
8b5d03096d
Merge pull request #13587 from grafana/nikoalch-patch-4
Update mac.md
2018-10-10 13:35:19 +02:00
Daniel Lee
7bbd303c23
Merge pull request #13586 from grafana/nikoalch-patch-3
Update windows.md
2018-10-10 11:54:52 +02:00
Daniel Lee
7c2efbac0d
Merge pull request #13585 from grafana/nikoalch-patch-2
Update rpm.md
2018-10-10 11:54:20 +02:00
Erik Sundell
ae44a6b6e9
Use correct naming convention 2018-10-10 10:39:10 +02:00
Erik Sundell
840a6e45da
Fix typo 2018-10-10 10:02:13 +02:00
Erik Sundell
939be51496
Provide more information about what's included in the Stackdriver plugin 2018-10-10 09:57:43 +02:00
Daniel Lee
bbd5e19a34
Merge pull request #13584 from grafana/nikoalch-patch-1
Update debian.md
2018-10-10 08:34:33 +02:00
Carl Bergquist
8962ca81a6
Merge pull request #13574 from grafana/update-stackdriver-provisioning-docs
Improve Stackdriver provisioning docs
2018-10-09 12:39:13 +02:00
Antoine Cordier
6bab602ecc Update provisioning.md (#13572) 2018-10-09 12:24:23 +02:00
Erik Sundell
1a838ce75d stackdriver: update docs, showing how to escape private key and use yaml multiline strings 2018-10-09 11:40:07 +02:00
Erik Sundell
11b9f9691c stackdriver: improve filter docs for wildcards and regular expressions 2018-10-08 15:57:31 +02:00
Erik Sundell
46ca306c2f stackdriver: always use regex full match for =~ and !=~operator 2018-10-08 15:57:30 +02:00
Emil Hessman
69cf131f81 docs: fix minor typos 2018-10-06 17:09:41 +02:00
Marcus Efraimsson
c670897c6a
docs: new variable type text box that allows free text input 2018-10-04 18:45:47 +02:00
Marcus Efraimsson
b03a25198b
docs: annotations tag filter with template variable support 2018-10-04 18:25:16 +02:00
Daniel Lee
a44e8c5917 docs: whats new in 5.3 - a few tweaks 2018-10-04 17:46:16 +02:00
Marcus Efraimsson
d2dc770c79
various fixes and improvements 2018-10-03 17:10:41 +02:00
Marcus Efraimsson
30fca2b181
Merge remote-tracking branch 'origin/master' into 5.3-release-post 2018-10-03 16:25:44 +02:00
Leonard Gram
00843037d4 docs: better wording and docs links. 2018-10-03 13:56:43 +02:00
dadosch
2500fe27f1
Fix "appropriate"-typo 2018-10-02 19:20:48 +00:00
dadosch
b138ae9d4c
Update configuration doc to include socket@server
`protocol=socket` and `socket=` path in [server]

fixes https://github.com/grafana/grafana/issues/8701
2018-10-02 18:59:55 +00:00
Marcus Efraimsson
3932e4db5a
Merge remote-tracking branch 'origin/master' into concurrent-sql 2018-10-02 17:44:33 +02:00
Marcus Efraimsson
e5c376aead
docs: connection limits for sql datasources 2018-10-02 17:43:54 +02:00
Steven Arnott
043d5f1c05
Update ldap.md 2018-10-01 11:41:19 -04:00
Leonard Gram
b29ac5c509 docs: stackdriver version notice. 2018-10-01 14:35:20 +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
Daniel Lee
d405d8f255 stackdriver: publish docs to v5.3 (not root) 2018-09-27 10:14:10 +02:00
Daniel Lee
66c95991c1 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-26 17:59:56 +02:00
Daniel Lee
4c695dbd57 stackdriver: docs update 2018-09-26 17:54:32 +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
Carl Bergquist
4520962ac2
Merge pull request #13401 from grafana/render-limits
Concurrent render limits
2018-09-25 15:28:57 +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
Leonard Gram
06d24df7b4 docs: postgres gif. 2018-09-24 16:58:39 +02:00
Leonard Gram
ac5d585902 docs: whats new for 5.3 2018-09-24 16:31:59 +02:00
Torkel Ödegaard
98dad530e2 provisioning: changed provisioning default update interval from 3 to 10 seconds 2018-09-22 10:06:57 +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
855a2a9259 docs: changed Json Web Token wording to be just JSON key file 2018-09-21 11:30:57 +02:00
Torkel Ödegaard
c282f39121 Merge branch 'master' into stackdriver-plugin 2018-09-21 10:17:13 +02:00
Ben Doyle
7a95791025 Fix misspelled authentication in Auth overview doc 2018-09-20 14:16:43 +01: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
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
bergquist
7588283287 docs: template variable support for annotations 2018-09-17 09:30:03 +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
Sven Klemm
138e7ab264 Add documentation for PostgreSQL query builder 2018-09-14 21:58:02 +02:00
Torkel Ödegaard
5fbe8eff4f ldap: made minor change to group search, and to docs 2018-09-14 11:28:17 +02:00
Daniel Lee
b8231b2903 stackdriver: ux for config page, docs updated 2018-09-14 09:39:16 +02:00
Daniel Lee
b1db6a7d1e docs: first draft for stackdriver datasource 2018-09-14 09:35:27 +02:00
Marcus Efraimsson
c56ca57df5
docs: include active directory ldap example and restructure 2018-09-12 17:54:47 +02: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
Matthias Loibl
d561104b64
Add jsonnet with grafonnet-lib to provisioning docs 2018-09-10 11:45:23 +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
Marcus Efraimsson
479e073451
docs: what's new in v5.3 placeholder 2018-09-06 15:22:03 +02: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
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
Leonard Gram
500a4b5f35 docs: default paths in the docker container. 2018-09-05 16:46:22 +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
Sven Klemm
cb526d4557 Add min time interval to mysql and mssql 2018-09-05 12:02:57 +02:00
Sven Klemm
fd269945c9 document postgres min time interval 2018-09-05 09:57:09 +02:00
Benjamin Schweizer
4bf8f80657 Merge remote-tracking branch 'upstream/master' 2018-09-04 17:42:15 +02:00
Marcus Efraimsson
8fcc9b1891
docs: postgres provisioning 2018-09-04 11:33:43 +02:00
Sven Klemm
82e601250d Merge branch 'master' into postgres-query-builder 2018-09-03 22:05:53 +02:00
Benjamin Schweizer
82554ffd67 Merge remote-tracking branch 'upstream/master' 2018-09-03 15:55:44 +02:00
Marcus Efraimsson
db2264c554
docs: v5.2 upgrade notice, ref #13084 2018-09-03 15:12:17 +02:00
Marcus Efraimsson
1ceca5d8ec
Merge pull request #12145 from grafana/alerting_reminder
Alerting notification reminder
2018-09-03 14:41:38 +02:00
Sven Klemm
de917dfc4d Merge branch 'master' into postgres-query-builder 2018-09-03 13:43:58 +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
4f91087d9a docs: minor updates, more work to do 2018-08-31 07:15:07 +02:00
Sven Klemm
aa2098fedf document postgres version and TimescaleDB option 2018-08-30 08:18:22 +02:00
Torkel Ödegaard
1e2fde238c docs: corrected docs description for setting 2018-08-29 13:26:23 +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
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
bergquist
fda9790ba5 upgrades to golang 1.11 2018-08-25 21:23:20 +02:00
Marcus Efraimsson
6995242b8b
copy and docs update for alert notification reminders 2018-08-24 19:13:52 +02:00
Marcus Efraimsson
51069c9ccb
docs: reminder notifications update 2018-08-23 18:56:37 +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
d38c159893 added link to getting started to all, changed wording 2018-08-23 14:39:50 +02: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
Stefan
2b1f84cd43
Update notifications.md 2018-08-21 15:53:57 +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
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
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
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
Marcus Efraimsson
c5c518fd17
docs: remove message property in response from get alerts http api
Fixes #12524
2018-08-14 15:17:29 +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
47cb0c47fd docs: document GitLab authentication backend 2018-08-14 14:11:48 +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
Marcus Efraimsson
de25a4fe4e
docs: update 2018-08-14 12:40:07 +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
Sven Klemm
a96d97e347 add version disclaimer for TimescaleDB 2018-08-14 10:26:08 +02:00
Sven Klemm
d33019ca67 document TimescaleDB datasource option 2018-08-14 10:22:57 +02:00
Tobias Skarhed
e696dc4d5f Remove Karma scripts and docs 2018-08-14 09:28:08 +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
d110343e53
Merge pull request #12838 from grafana/12476-show-teams-on-profile
show teams on profile
2018-08-13 15:16:04 +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
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
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
Wade Robson
62a25a4f28
Add example OR search_filter to docs 2018-08-08 09:13:28 -07: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
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
ee7602ec1f change fillmode from last to previous 2018-08-07 21:01:41 +02:00
Benjamin Schweizer
9220f83b3d replaced escape() call, renamed formatter to be more expressive 2018-08-06 21:54:12 +02:00
dadosch
4e33314c14 unix socket docs 2018-08-06 14:40:30 +02:00
Emil Flink
5bea54eaaa Support client certificates for LDAP servers 2018-08-03 12:00:20 +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
Sven Klemm
82c473e3af document $__timeGroupAlias 2018-08-01 21:23:00 +02:00
Sven Klemm
43295f9c18 remove alias from postgres $__timeGroup macro 2018-08-01 08:50:19 +02:00
Benjamin Schweizer
a2967565de added urlescape formatting option 2018-07-30 17:19:41 +02:00
Sven Klemm
8a22129177 add version note to metric prefix and fix typo 2018-07-30 14:37:23 +02:00
Sven Klemm
bc9b6ddefe document metric column prefix for mysql and mssql 2018-07-27 17:14:27 +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
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
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
Marcus Efraimsson
582652145f
minor fixes 2018-07-24 19:21:23 +02:00
Leonard Gram
59c1705399 docs: mentation that config changes requires restart. 2018-07-24 10:34:11 +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
Torkel Ödegaard
913b8576f8 docs: minor docs fix 2018-07-18 13:20:28 +02:00
Torkel Ödegaard
3fa2ec0762 Merge branch 'ldap-grafana-admin' 2018-07-18 13:02:49 +02:00
Jakob van Santen
92d417f6b4 Handle query string in storage public_url (#9351) (#12555) 2018-07-17 11:10:12 -07: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
Torkel Ödegaard
c189262bac ldap: Make it possible to define Grafana admins via ldap setup, closes #2469 2018-07-16 16:56:42 +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
Shane
756c08e713 changed you to your (#12590) 2018-07-12 23:56:37 -07:00
nikoalch
f34f5008ba
Update mac.md
added local login info
2018-07-11 08:15:23 -07:00
nikoalch
a0e1f58815
Update windows.md 2018-07-11 08:14:25 -07:00
nikoalch
bcb11d6747
Update rpm.md
added local login info
2018-07-11 08:13:48 -07:00
nikoalch
e944803f10
Update debian.md
added local login info
2018-07-11 08:13:15 -07:00
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
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
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
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
Dan Cech
3056d9a80e support passing api token in Basic auth password (#12416) 2018-06-28 03:08:32 -07: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
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
5a2cf5863d
Merge pull request #12399 from grafana/12140_docs
docs: update installation instructions
2018-06-26 10:37:22 +02:00
peng weikang
e4669681c4
Fix typo 2018-06-26 14:04:54 +08:00
Marcus Efraimsson
31239f33ed
docs: update installation instructions 2018-06-25 17:22:31 +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
8b5d78a63e
docs: what's new in v5.2 and docker installation updates
[skip ci]
2018-06-20 18:53:17 +02:00
Marcus Efraimsson
f73c04086c
docs: update installation instructions 2018-06-19 15:00:45 +02:00
Daniel Lee
94f39cb734 docs: Plugin review guidelines and datasource auth pages 2018-06-19 13:16:41 +02: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
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
10d840b1cc docs: adds info about grafana-dev container 2018-06-15 11:07:23 +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
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
Malcolm Jones
2765afc830 Document the endpoint for deleting an org 2018-06-14 15:28:54 -04:00
Anton Sergeyev
516839d7b2 #11607 Cleanup time of temporary files is now configurable 2018-06-14 12:35:22 +05:00
nikoalch
0cc8ccdaa5
Update graphite.md 2018-06-13 08:40:15 -04: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
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
Ken Dombeck
110522307a
Correct Provisioning documentation link
It was pointing to Prometheus documentation instead.
2018-06-12 09:01:25 -07:00
Tobias Skarhed
8155ce9804 Docs: Update Build from Source 2018-06-12 15:06:17 +02:00
Jiang Ye
c92874875c removed QueryOptionsCtrl references 2018-06-09 16:06:03 -04:00
Leonard Gram
9e7651a1b3
docs: docker secrets available in v5.2.0 2018-06-05 13:54:23 +02:00
Dan Cech
9b29a19609
update google auth config docs 2018-06-04 12:32:35 -04: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
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
Leonard Gram
e562ae753b
docs: docker secrets support. (#12141)
Closes #12132
2018-06-04 11:49:12 +02:00
bergquist
75ee1e9208 renames intervalSeconds to updateIntervalSeconds 2018-06-04 08:13:20 +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
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
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
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
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
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
xginn8
68bc9dd9dc
update provisioning.md
stylize & name datasources properly
2018-05-21 11:19:44 -04:00
Carl Bergquist
a376de56f2
Merge pull request #11934 from liquidm/improve_alert_docs
Improve alert docs
2018-05-21 14:34:58 +02:00
Torkel Ödegaard
a73365c3fe codespell: fixes 2018-05-18 11:49:00 +02:00
Daniel Lee
75993971c6 docs: installation pages for 5.1.3 2018-05-16 21:48:26 +02: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
bergquist
ca25a25386 docs: removes notes about beeing introduced in 5.0 2018-05-14 09:51:23 +02:00
Bernie
1157542f70
Update dashboard_permissions.md
miss { in repsponse
2018-05-11 10:19:28 +08:00
Marcus Efraimsson
486aaca109
docs: update installation instructions targeting v5.1.2 stable 2018-05-09 14:03:22 +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
Šimon Podlipský
ef60d89742
Update dashboard.md 2018-05-08 21:25:45 +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
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
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
Dan Cech
543c7fe587 support additional fields in authproxy (#11661) 2018-05-07 10:39:16 +02:00
Ryan McKinley
2ee59ccad8 Add panel scrolling docs (#11826) 2018-05-07 08:03:30 +02:00
Sven Klemm
ed4dc241cc escape pipe symbol same way as in templating docs 2018-05-05 10:47:44 +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
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
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
7992897418
docs: add known issues section for mssql documentation
Fixes #11707
2018-04-24 16:30:24 +02:00
Marcus Efraimsson
85ccefdb84
Merge branch 'master' into docs-5.1 2018-04-24 16:17:15 +02:00
Sven Klemm
eb994ad72e Merge remote-tracking branch 'upstream/master' into postgres-docs-timefilter 2018-04-21 18:31:45 +02: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
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
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
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
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
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
ohadbenita
4664549411
Specify expected encoding for access/secret key 2018-04-17 23:55:07 +03:00
bergquist
fa49332915 docs: typos 2018-04-17 19:09:39 +02:00
Marcus Efraimsson
d30835f648
docs: update provisioning documentation
In addition to closing #10883
2018-04-17 17:22:25 +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
Marcus Efraimsson
90ed046ce3 docs: elasticsearch and influxdb docs for group by time interval option (#11609) 2018-04-16 16:03: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
92ac1fbb5b
Merge branch 'master' into docs-5.1 2018-04-16 09:58:46 +02:00
Carl Bergquist
693ff1c000
Merge pull request #11579 from towolf/add-url-param-for-inactive-mode
Add another URL param «inactive» which works like «kiosk» but with title
2018-04-16 09:35:57 +02:00
Daniel Lee
67daa9b058
Merge pull request #11588 from mjtrangoni/fix-codespell-issues
Fix codespell issues
2018-04-16 09:12:49 +02:00
Vitaliy
e2add988ec
Documentation spelling fix 2018-04-14 09:56:47 -04:00
Mario Trangoni
638f7d23d4 docs: fix codespell issues 2018-04-13 20:31:29 +02:00
Marcus Efraimsson
48143d6caf
Merge branch 'master' into docs-5.1 2018-04-13 16:40:38 +02:00
Marcus Efraimsson
511b34eb5c
docs: improves provisoning example for postgres
[skip ci]
2018-04-13 16:37:49 +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
a6a45afc2b
Merge branch 'master' into provisioning_datasources_examples 2018-04-13 15:25:28 +02:00
Marcus Efraimsson
14bf067263
docs: improves provisoning example for each datasource 2018-04-13 15:25:13 +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
Tobias Wolf
f143cb655a Mention the ?inactive parameter in the docs 2018-04-12 21:38:28 +02:00
Tim O'Guin
1f0dfbbf86 Improve wording 2018-04-11 21:36:07 -05:00
Tim O'Guin
ee7943b9b2 Add minimal IAM policy example for CloudWatch data source 2018-04-11 21:29:11 -05: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
Caleb Tote
5f47523d76
Update annotations.md to contain correct annotations api path 2018-04-09 15:09:37 -04:00
Daniel Lee
d39dac10a6 docs: update after #11531 2018-04-09 15:19:41 +02:00
bergquist
2889a405a7 docs: improves provisoning example text 2018-04-09 14:56:42 +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
bergquist
25be937bfa docs: fixes typo 2018-04-09 09:55:10 +02:00
Torkel Ödegaard
d60c7b2013 docs: updated debian distro in install docs to stretch, closes #11527 2018-04-09 08:18:58 +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
Daniel Lee
51b078fb65 docs: spelling 2018-04-03 09:47:53 +02:00
Sven Klemm
2bdcebb5b1 add article 2018-03-30 16:47:51 +02:00
Sven Klemm
cb156ee30b fix some typos 2018-03-30 16:42:48 +02:00
bergquist
d95eabfeec docs: adds provisioning examples for all datasources
closes #11363
2018-03-28 17:39:00 +02:00
Angus Burroughs
e645c51f7c
Fixed typo in upgrading.md
Line 26: 'you' to 'your' in "make a backup of you 'grafana.db'"
2018-03-28 16:26:15 +02:00
Daniel Lee
86776154cc docs: rpm install page - update to centos 7 2018-03-28 15:35:51 +02:00
Daniel Lee
485d0f1c95 docs: install pages for v5.0.4 2018-03-28 15:19:46 +02:00
Tariq Ettaji
8985e5ac53 Clarified formatting multiple values doc 2018-03-28 12:51:12 +02:00
bergquist
2743e8be20 docs: not about email notifications and local img store
cloes #11054
2018-03-27 21:21:38 +02:00
Marcus Efraimsson
828dd34507 docs: update table plugin documentation with value/range to text mapping 2018-03-27 20:18:04 +02: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
Carl Bergquist
cdf4664930
Merge pull request #11371 from towolf/add-duplicate-panel-hints
Add hints for the 'pd' Duplicate Panel command from PR #11264
2018-03-27 10:35:41 +02:00
Alexander Zobnin
2c7040c246 docs: prometheus ds, remove "new in v4.3" note 2018-03-27 09:48:19 +03:00
Alexander Zobnin
b97cede054 docs: update heatmap and prometheus docs, #10009 2018-03-26 17:12:25 +03:00
Sven Klemm
f2249a5bcc add missing word to graphite docs 2018-03-25 15:49:06 +02:00
Tobias Wolf
02f84e0c74 Add hints for the 'pd' Duplicate Panel command from PR #11264 2018-03-24 14:41:41 +01: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
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
Daniel Lee
7b141280e5 docs: tweaks 2018-03-23 13:31:02 +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
Marcus Efraimsson
1d515bb52c Merge branch 'master' into docs-5.1 2018-03-23 10:40:12 +01:00
Daniel Lee
1c1d962bb1 docs: spelling 2018-03-23 09:04:50 +01:00
Daniel Lee
ccfe9de014 docs: add intro paragraph to provisioning page 2018-03-23 08:55:11 +01:00
ryan
a2bbd89a9e adding updated column 2018-03-22 15:52:09 +01:00
Daniel Lee
624dac16fa docs: add variable regex examples (#11327) 2018-03-21 13:23:50 +01:00
bergquist
f41f2089a2 docs: details about provisioning elastic
closes #11292
2018-03-21 08:54:09 +01:00
Daniel Lee
e5df179c7c docs: spelling 2018-03-20 20:38:20 +01:00
Daniel Lee
1cef373d16 Merge remote-tracking branch 'upstream/master' into update-xorm 2018-03-20 19:21:58 +01:00
Marcus Efraimsson
74c3f732c1 docs: update using mssql in grafana 2018-03-20 10:59:35 +01:00