IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-28 19:54:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,223 Commits 5,099 Branches 538 Tags 1.9 GiB
b7feabdb58
Commit Graph

1295 Commits

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