root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 40 Packages Projects Releases Wiki Activity
19,677 Commits 1,405 Branches 636 Tags 2.5 GiB
Commit Graph

1538 Commits

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