IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,248 Commits 5,085 Branches 538 Tags 1.9 GiB
5b318428c4
Commit Graph

974 Commits

Author SHA1 Message Date
Torkel Ödegaard
25aa9df270 Create annotations (#8197) 
* annotations: add 25px space for events section

* annotations: restored create annotation action

* annotations: able to use fa icons as event markers

* annotations: initial emoji support from twemoji lib

* annotations: adjust fa icon position

* annotations: initial emoji picker

* annotation: include user info into annotation requests

* annotation: add icon info

* annotation: display user info in tooltip

* annotation: fix region saving

* annotation: initial region markers

* annotation: fix region clearing (add flot-temp-elem class)

* annotation: adjust styles a bit

* annotations: minor fixes

* annoations: removed userId look in loop, need a sql join or a user cache for this

* annotation: fix invisible events

* lib: changed twitter emoij lib to be npm dependency

* annotation: add icon picker to Add Annotation dialog

* annotation: save icon to annotation table

* annotation: able to set custom icon for annotation added by user

* annotations: fix emoji after library upgrade (switch to 72px)

* emoji: temporary remove bad code points

* annotations: improve icon picker

* annotations: icon show icon picker at the top

* annotations: use svg for emoji

* annotations: fix region drawing when add annotation editor opened

* annotations: use flot lib for drawing region fill

* annotations: move regions building into event_manager

* annotations: don't draw additional space if no events are got

* annotations: deduplicate events

* annotations: properly render cut regions

* annotations: fix cut region building

* annotations: refactor

* annotations: adjust event section size

* add-annotations: fix undefined default icon

* create-annotations:  edit event (frontend part)

* fixed bug causes error when hover event marker

* create-annotations:  update event (backend)

* ignore grafana-server debug binary in git (created VS Code)

* create-annotations: use PUT request for updating annotation.

* create-annotations: fixed time format when editing existing event

* create-annotations: support for region update

* create-annotations: fix bug with limit and event type

* create-annotations: delete annotation

* create-annotations: show only selected icon in edit mode

* create-annotations: show event editor only for users with at least Editor role

* create-annotations: handle double-sized emoji codepoints

* create-annotations: refactor

use CP_SEPARATOR from emojiDef

* create-annotations: update emoji list, add categories.

* create-annotations: copy SVG emoji into public/vendor/npm and use it as a base path

* create-annotations: initial tabs for emoji picker

* emoji-picker: adjust styles

* emoji-picker: minor refactor

* emoji-picker: refactor - rename and move into one directory

* emoji-picker: build emoji elements on app load, not on picker open

* emoji-picker: fix emoji searching

* emoji-picker: refactor

* emoji-picker: capitalize category name

* emoji-picker: refactor

move buildEmojiElem() into emoji_converter.ts for future reuse.

* jquery.flot.events: refactor

use buildEmojiElem() for making emojis, remove unused code for font awesome based icons.

* emoji_converter: handle converting error

* tech: updated

* merged with master

* shore: clean up some stuff

* annotation: wip tags

* annotation: filtering by tags

* tags: parse out spaces etc. from a tags string

* annotations: use tagsinput component for tag filtering

* annotation: wip work on how we query alert & panel annotations

* annotations: support for updating tags in an annotation

* linting

* annotations: work on unifying how alert history annotations and manual panel annotations are created

* tslint: fixes

* tags: create tag on blur as well

Currently, the tags directive only creates the tag when the
user presses enter. This change means the tag is created on
blur as well (when the user clicks outside the input field).

* annotations: fix update after refactoring

* annotations: progress on how alert annotations are fetched

* annotations: minor progress

* annotations: progress

* annotation: minor progress

* annotations: move tag parsing from tooltip to ds

Instead of parsing a tag string into an array in the annotation_tooltip
class, this moves the parsing to the datasources. InfluxDB ds already
does that parsing. Graphite now has it.

* annotations: more work on querying

* annotations: change from tags as string to array

when saving in the db and in the api.

* annotations: delete tag link if removed on edit

* annotation: more work on depricating annotation title

* annotations: delete tag links on delete

* annotations: fix for find

* annotation: added user to annotation tooltip and added alertName to annoation dto

* annotations: use id from route instead from cmd for updating

* annotations: http api docs

* create annotation: last edits

* annotations: minor fix for querying annotations before dashboard saved

* annotations: fix for popover placement when legend is on the side (and doubel render pass is causing original marker to be removed)

* annotations: changing how the built in query gets added

* annotation: added time to header in edit mode

* tests: fixed jshint built issue
 2017-10-07 10:31:39 +02:00
Patrick O'Carroll
e951200404 docs page for authproxy (#9420) 2017-10-05 19:01:15 +02:00
Patrick O'Carroll
81be4e2612 Update codebox (#9430) 
* updated the codeboxes in docs

* codebox change from json to http
 2017-10-05 19:01:03 +02:00
bergquist
15ece1da04 changes go version to 1.9.1 2017-10-05 11:35:14 +02:00
Ricard Clau
e4541a7fd1 support for s3 path (#9151) 2017-10-04 21:04:20 +02:00
Carl Bergquist
ba074062d6 Merge pull request #9392 from xginn8/slack_image_upload 
adding support for token-based slack file.upload API call for posting images to slack
 2017-10-04 10:29:15 +02:00
Patrick O'Carroll
e1a86e63b8 some restyling (#9409) 2017-10-03 13:35:12 +02:00
Patrick O'Carroll
dd83b67de5 Docs text fixes (#9408) 
* styling changes and some text changes

* styling changes
 2017-10-03 13:34:52 +02:00
Torkel Ödegaard
503336bcd5 docs: minor docs fix 2017-10-02 15:30:37 +02:00
Torkel Ödegaard
38ae460f59 docs: updated building from source docs 2017-10-02 10:55:56 +02:00
Torkel Ödegaard
f5e8a4069c docs: minor fixes for #9369 2017-10-02 09:02:58 +02:00
Torkel Ödegaard
0c86241c5b Webpack (#9391) 
* webpack poc, this is not going to work for plugins, dam

* tech: webpack and systemjs for plugins starting to work

* tech: webpack and systemjs combo starting to work

* tech: webpack + karma tests progress

* tech: webpack + karma progress

* tech: working on tests

* tech: webpack

* tech: webpack + karma, all tests pass

* tech: webpack + karma, all tests pass

* tech: webpack all tests pass

* webpack: getting closer

* tech: webpack progress

* webpack: further build refinements

* webpack: ng annotate fixes

* webpack: optimized build fix

* tech: minor fix for elasticsearch

* tech: webpack + ace editor

* tech: restored lodash move mixin compatability

* tech: added enzyme react test and upgraded to react v16

* tech: package version fix

* tech: added testdata to built in bundle

* webpack: sass progress

* tech: prod & dev build is working for the sass

* tech: clean up unused grunt stuff and moved to scripts folder

* tech: added vendor and manifest chunks, updated readme and docs

* tech: webpack finishing touches
 2017-10-01 20:02:25 +02:00
Matthew McGinn
00726e93eb adding support for token-based slack file.upload API call for posting images to slack 2017-09-30 21:20:20 -04:00
bergquist
7f6924ff13 change go version to 1.9 2017-09-28 11:22:13 +02:00
Patrick O'Carroll
0a65100eaf made a text-panel page, maybe we don't need it 2017-09-28 10:05:28 +02:00
Torkel Ödegaard
50d82155ed Merge branch 'master' of https://github.com/williamjoy/grafana into williamjoy-master 2017-09-27 09:37:26 +02:00
Tobias Hintze
af79d046db introduce smtp config option for EHLO identity 2017-09-24 20:48:20 +02:00
Patrick O'Carroll
3f1452fddb new page for text, needs more work 2017-09-22 17:14:39 +02:00
Patrick O'Carroll
1258dc1cbb replaced img in graph, created alert list page 2017-09-22 16:31:34 +02:00
Torkel Ödegaard
ca0085f429 docs: update docs 2017-09-22 14:05:25 +02:00
Carl Bergquist
63f78c0b59 Merge pull request #9299 from seuf/grafana-cli-plugin-url 
Added --pluginUrl option to grafana-cli for local network plugin inst…
 2017-09-22 13:13:17 +02:00
Patrick O'Carroll
31243e7132 replaced image 2017-09-22 12:53:37 +02:00
Patrick O'Carroll
367acc37c7 Docs new updates (#9324) 
* replaced images, updating text(not finished)

* text uppdates for dashlist and singlestat(+img). updated the keyboard shortcuts

* deleted old shortcuts instruction

* another img update
 2017-09-22 10:49:47 +02:00
Patrick O'Carroll
bf88242282 another img update 2017-09-21 16:58:25 +02:00
Patrick O'Carroll
f6aefbd361 deleted old shortcuts instruction 2017-09-21 16:18:24 +02:00
Patrick O'Carroll
fe05a996b7 text uppdates for dashlist and singlestat(+img). updated the keyboard shortcuts 2017-09-21 15:58:19 +02:00
Patrick O'Carroll
ece6588c03 replaced images, updating text(not finished) 2017-09-21 09:40:58 +02:00
Andreas Kohn
3b565dccd8 Explicitly refer to Github 'OAuth' applications 
A 'Github Application' is now something else, and will not work with Grafana.
 2017-09-19 13:21:15 +02:00
William
88a8991722 config bucket and region for s3 uploader 
this is to support cn-north-1 region as it can get s3 url programatically.
also keeps support 'bucket_url' for backward compatiblity
 2017-09-19 04:57:25 -04:00
Torkel Ödegaard
a081f90403 Merge branch 'master' of github.com:grafana/grafana 2017-09-18 09:08:42 +02:00
ParadoxalManiak
c94f5b456a Update upgrading.md (#9263) 
Fixed some minor writing issues.
 2017-09-15 22:15:12 +02:00
THIERRY SALLE
e978bfc368 Added --pluginUrl option to grafana-cli for local network plugin installation 2017-09-15 20:34:08 +02:00
Konstantin Chukhlomin
7e3c9fcc1c Reduced OAuth scope to read_write 2017-09-15 16:11:02 +02:00
Konstantin Chukhlomin
fcdf282090 GCS support via JSON API 2017-09-15 16:11:02 +02:00
Konstantin Chukhlomin
72d7c4d620 Added GCS support #8370 2017-09-15 16:11:02 +02:00
Daniel Lee
f534ea057c 4.5.1 docs + update version to 5.0.0-pre1 2017-09-15 11:27:16 +02:00
bergquist
bf138d1845 adds small docs page metrics 2017-09-14 14:26:32 +02:00
Torkel Ödegaard
a5c08a72fb docs: update download links 2017-09-14 11:28:59 +02:00
Patrick O'Carroll
337fb9bdfa fixed some images (#9237) 2017-09-14 11:04:01 +02:00
Torkel Ödegaard
4e719aa0c1 docs: minor update 2017-09-14 10:50:34 +02:00
Torkel Ödegaard
a76f3fba2e docs: minor fixes to images 2017-09-13 17:11:10 +02:00
Patrick O'Carroll
d71456b96f Docs image updates (#9225) 
* replaced old images and gifs with new ones

* replaced images, changed some text especially for column styles

* replaced and added images and gifs
 2017-09-13 16:29:53 +02:00
Daniel Lee
379f984293 docs: windows - add note about ini comments 2017-09-12 11:08:28 +02:00
Torkel Ödegaard
fd76c855f9 Merge branch 'master' of github.com:grafana/grafana 2017-09-12 10:32:02 +02:00
Torkel Ödegaard
e16cadaa27 docs: minor update 2017-09-12 10:31:53 +02:00
Daniel Lee
665fef0114 docs: kiosk mode options add to playlist doc 2017-09-12 10:31:13 +02:00
Patrick O'Carroll
a7b0a01b13 replaced old images and gifs with new ones (#9217) 2017-09-12 09:07:36 +02:00
Torkel Ödegaard
93be16b106 docs: minor docs update 2017-09-07 16:55:36 +02:00
Torkel Ödegaard
8ec33574a1 docs: added v4.4 to docs archive 2017-09-07 16:44:41 +02:00
Patrick O'Carroll
de647c4100 docs: uppdated getting started with images and text, added info on query inspector to version45 and trouble shooting (#9193) 2017-09-07 16:32:55 +02:00
Carl Bergquist
4670c74942 Merge pull request #9022 from adriangarza/master 
added CloudWatch data source API documentation
 2017-09-07 14:10:53 +02:00
Patrick O'Carroll
095ac80d19 docs: updated image in docs (#9184) 2017-09-06 16:31:17 +02:00
Torkel Ödegaard
b333ad9481 docs: updated docs with v4.5 beta links 2017-09-05 16:01:28 +02:00
Daniel Lee
52676161bb docs: update to http api admin section 
Make it clearer that it only works with basic auth
 2017-09-05 10:04:01 +02:00
Torkel Ödegaard
9bafb108f7 docs: added docs archive for v4.3 2017-09-04 13:38:46 +02:00
jenlersadnie
0ba5706400 Fixing a minor typo under Selection Options (#9082) 
Mulit => Multi
 2017-08-23 08:50:22 +02:00
Daniel Lee
d19aa89ec0 docs: .ini file semicolon is comment 
ref #7725
 2017-08-21 21:28:49 +02:00
ericslaw
73f0bd3b4b fix link to opentsdb templating (#9039) 2017-08-16 16:57:27 +02:00
Daniel Lee
167995776f docs: update to tag alias 
ref #9024
 2017-08-11 11:30:30 +02:00
Daniel Lee
c4feef2541 docs: http api /users - corrections + adds missing method 2017-08-11 10:24:54 +02:00
Adrian Garza
5420f271f1 added CloudWatch data source API documentation 
access and secret keys are base64-encoded gibberish
 2017-08-10 16:03:42 -07:00
Daniel Lee
b716a2595a mysqlds: add support for key/value template variables 
If the template variable query has two columns named __text and __value
then return a list of key values. The value is used when the variable is
interpolated in the query. Allows mapping of texts to ids.
 2017-08-10 14:42:27 +02:00
Daniel Lee
1105bb371f mysqlds: adds support for template variables 
Fixes #8855
 2017-08-09 19:32:53 +02:00
Daniel Lee
ee835242ca Merge branch 'v4.4.x' 2017-08-07 13:14:24 +02:00
Daniel Lee
def45f55da docs: update installation for version 4.4.3 2017-08-07 13:11:57 +02:00
Sébastien Fievet
8e618bc169 Fix some typos in alerting documentation (#8986) 2017-08-04 10:08:41 +01:00
Daniel Lee
1ce134cc6f docs: fixes #8972. Note on clustering and alerting. 2017-08-03 15:37:04 +02:00
Daniel Lee
b5017d1e18 docs: var in singlestat panel. Fixes #8563 2017-08-02 16:44:43 +02:00
Torkel Ödegaard
ae3e869d70 updated download links in docs 2017-08-01 10:18:48 +02:00
Torkel Ödegaard
5d2054323b Merge branch 'aws-instance-attribute-tags' of https://github.com/paco3346/grafana into paco3346-aws-instance-attribute-tags 2017-08-01 09:38:58 +02:00
Cedric Cellier
417c5163dd Fix typos (#8954) 
Some being user visible.
 2017-07-31 12:12:28 +02:00
Fredrik Wendt
5542309170 fixed incorrect header text (#8952) 
Status code now replaced with Query parameters
 2017-07-29 15:34:22 +01:00
Fredrik Wendt
6b344d0158 removed incorrect HTTP response data (#8949) 
the example response body contained incorrect out-of-place data, presumably from a copy-paste operation
 2017-07-28 09:25:30 +02:00
Torkel Ödegaard
d46fd890a5 Merge branch 'v4.4.x' 2017-07-24 12:38:39 +02:00
Torkel Ödegaard
8ca08d65e7 docs: updated configuration docs with new defaults, #8743 2017-07-24 12:37:58 +02:00
Nicholas Nadeau
1a25b78ef2 homogenized docker run command (#8907) 
There are three locations where the `docker run` command is referenced:
- 2x http://docs.grafana.org/installation/docker/
- 1x https://grafana.com/grafana/download?platform=docker

The fix syncs the given `docker run` command arguments with the other two.
 2017-07-21 21:46:54 +02:00
Adam Johnson
17d57ab074 docs(testdata): add missing word (#8856) 2017-07-13 19:52:59 +02:00
bergquist
4844bf9be3 docs(prometheus): updates invalid template example 2017-07-12 07:37:44 +02:00
Moody Saada
2d99518f90 Update annotations.md typo (#8830) 2017-07-12 06:53:28 +02:00
Daniel Lee
1dedc886f2 docs: DingDing notifier 2017-07-10 12:22:21 +02:00
Daniel Lee
1ccfca109f docs: instructions for DingDing notifier 2017-07-10 12:16:40 +02:00
Daniel Lee
68e7219135 docs: add missing parameter api call 2017-07-09 02:00:50 +02:00
Daniel Lee
fc82de1543 docs: style fix 2017-07-07 13:00:13 +02:00
Daniel Lee
c296e73b83 docs: x-axis mode for graph panel 2017-07-07 12:25:42 +02:00
Daniel Lee
eca11e862e docs: update for panel sharing options 2017-07-05 22:14:04 +02:00
Min-Zhong "John" Lu
fbff905c57 Fix broken table row in prometheus.md (#8779) 
"Metric Lookup" row in Query editor was broken :(
 2017-07-05 22:14:03 +02:00
Daniel Lee
a4266319ad packaging: v4.4.1 2017-07-05 22:14:03 +02:00
Daniel Lee
ab53b05c39 docs: fixes #8785 2017-07-05 22:14:03 +02:00
Daniel Lee
de9ebc9a74 packaging: updates for v4.4.0 2017-07-05 22:12:51 +02:00
Daniel Lee
36a1ab48c5 packaging: updates for v4.4.0 2017-07-05 22:04:27 +02:00
Daniel Lee
f773a9b4c3 docs: small change 2017-07-04 21:17:43 +02:00
Daniel Lee
a5afd8152d docs: small update 2017-07-03 21:32:12 +02:00
Daniel Lee
3ae5f7c632 docs: built-in variables, $__interval 
Fixes #8344. Documents the $__interval, $__interval_ms and $timeFilter
variables.
 2017-07-03 20:44:19 +02:00
Daniel Lee
20a2334c87 docs: spelling 2017-07-03 14:47:54 +02:00
Ben Tranter
6f4c7a4d65 Add dashboard version history documentation (#8741) 
Adds docs for the new API endpoints, and for the dashboard history feature.
 2017-07-03 14:29:30 +02:00
Daniel Lee
fb99ddf295 influxdb: tweak to help text 2017-06-29 13:58:54 +02:00
Daniel Lee
1a61d2814c docs: updates to build from source 2017-06-28 09:35:33 +02:00
Daniel Lee
53ea9cfbcf docs: update ha_setup with alerting deduping 2017-06-27 16:59:40 +02:00
Daniel Lee
10127e8ac9 docs: small updates 2017-06-26 17:42:50 +02:00
Haidara Mohamed El Mouctar
bc6a57ce32 [Docs] Add documentation for max_idle_conn and max_open_conn (#8675) 2017-06-21 10:41:56 -04:00
Daniel Lee
ad080af38f docs: add tutorial for using API 2017-06-17 20:59:19 +02:00
Daniel Lee
cb720d8eaf docs: add body options for snapshot api 2017-06-13 23:17:14 +02:00
Daniel Lee
a8e9700334 docs: add whitelist option for auth.proxy 2017-06-08 13:38:18 +02:00
Michael Ambrose
aa3a737fea Updated cloudwatch doc to be more clear on ec2_instance_attribute usage and added Tag selection example 2017-06-07 16:58:01 -04:00
aykim17
d996275f8f Updated the graphTooltip description (#8532) 
I added in a description since there was just TODO there originally.
 2017-06-04 14:23:52 +02:00
Torkel Ödegaard
ed2092e287 docs: updated alerting docs to make query conditions easier to understand, fixes #8486 2017-05-29 08:51:56 +02:00
Torkel Ödegaard
09267bbfe8 docs: elasticsearch, added info about size property in templating query 2017-05-25 20:11:53 +02:00
Torkel Ödegaard
d4048e1423 docs: updated download links 2017-05-23 16:18:37 +02:00
Torkel Ödegaard
423ad4d36e docs: updated docs 2017-05-23 12:45:15 +02:00
Joe Handzik
d4264cbfc2 Make location for plugins consistent (#8429) 
Please let me know if this changed in a more recent version of Grafana, but when using 4.2.0 the manual install directions were off a little (there was no `data/plugins` directory, only a `plugins` directory).

Signed-Off-By: Joe Handzik <joseph.t.handzik@hpe.com>
 2017-05-21 10:03:57 +02:00
A78677
ab874cd037 docs: Added requests body for 'Password for User' and 'Permissions' in the admin api documentation 2017-05-17 14:26:27 +02:00
Torkel Ödegaard
fd969bf659 Merge branch 'master' of github.com:grafana/grafana 2017-05-15 10:33:43 +02:00
Daniel Lee
fd5fc0b7ab docs: metadata change for guide post 2017-05-12 14:19:46 +02:00
Daniel Lee
88d4fde815 docs: v4.3.0-beta1 updates 2017-05-12 13:36:42 +02:00
Torkel Ödegaard
375e60750e docs: updated heatmap docs 2017-05-12 11:14:11 +02:00
Torkel Ödegaard
17198807c9 docs: updated mysql docs 2017-05-12 11:04:54 +02:00
Torkel Ödegaard
5076460254 docs: updated heatmap docs 2017-05-11 16:30:50 +02:00
Torkel Ödegaard
88672389f3 docs: minor docs fix 2017-05-11 14:16:05 +02:00
Torkel Ödegaard
2c3f3dffa3 docs: updated heatmap panel docs menu name 2017-05-11 13:02:10 +02:00
Torkel Ödegaard
2c5563442f docs: added initial mysql docs 2017-05-11 12:59:49 +02:00
Torkel Ödegaard
ab6740c685 heatmap: Docs and heatmap fixes 2017-05-11 10:19:47 +02:00
Torkel Ödegaard
0a68dabb89 heatmap: Fixes & progress on heatmap docs 2017-05-10 17:17:51 +02:00
Torkel Ödegaard
acff78d421 Merge branch 'master' into heatmap-refactoring2 2017-05-09 12:41:11 +02:00
Torkel Ödegaard
076a94560b Merge branch 'table-options' 2017-05-08 15:31:29 +02:00
Torkel Ödegaard
823b40a360 docs: added bash and http syntax highlighting 2017-05-08 08:02:08 +02:00
Torkel Ödegaard
e2f0b42d90 docs: updated cloudwatch docs, closes #8315 2017-05-08 06:49:55 +02:00
Dan Cech
e8fbfce59a remove unneeded import, update docs text 2017-05-05 13:11:44 -04:00
Torkel Ödegaard
dd5a426911 heatmap: refactoring heatmap 2017-05-05 16:15:08 +02:00
Torkel Ödegaard
e75bc5d39a docs: added templating docs link to app 2017-05-05 08:56:19 +02:00
Trent White
b4a8678cae remove duplicate paragraph, couple word tweaks 2017-05-04 10:34:19 -04:00
Torkel Ödegaard
0390a7c17b docs: fixed docs intro 2017-05-04 12:36:34 +02:00
Torkel Ödegaard
dbcd19bbce docs: minor update to OpenTSDB docs 2017-05-04 12:12:55 +02:00
Torkel Ödegaard
0bab1fd088 Merge branch 'templating-docs', closes #8243 2017-05-04 11:17:39 +02:00
Torkel Ödegaard
cbba692962 docs: influxdb docs update 2017-05-04 11:15:48 +02:00
Torkel Ödegaard
e80e0c044b docs: updated elasticsearch docs 2017-05-04 10:19:00 +02:00
Daniel Lee
e08188929d docs: update to alert notifications 2017-05-03 22:27:10 +02:00
Daniel Lee
b61de0cddc docs: fix API alerting docs 2017-05-03 17:24:27 +02:00
Torkel Ödegaard
287cd83e76 docs: grammarly fixes 2017-05-03 16:34:51 +02:00
Torkel Ödegaard
59fdda6559 docs: minor update to prometheus docs 2017-05-03 15:53:31 +02:00
Torkel Ödegaard
ed8d284715 docs: updated prometheus docs 2017-05-03 15:50:38 +02:00
Torkel Ödegaard
e6c29391c6 docs: improved Graphite templating docs 2017-05-03 14:20:59 +02:00
Torkel Ödegaard
2304a710bf docs: templating doc wip 2017-05-03 14:09:04 +02:00
Jon Freedman
6ebb31bed4 chore: add comment to clarify that org_id usage 
As described here: https://community.grafana.com/t/many-to-many-group-dn-org-role-mapping-in-ldap-config/729/2 org_id can be used to allow multiple group_dn's to map to the same org_role provided the org_id differs.
 2017-05-02 15:45:48 +01:00
Torkel Ödegaard
c1de972eb5 docs: wip templating docs 2017-05-02 16:22:31 +02:00
Daniel Lee
83c138f575 docs: fix mistake in api docs 2017-05-02 09:39:50 +02:00
Torkel Ödegaard
88dd8af4ce docs: Updates to screencasts & sharing docs 2017-04-28 13:43:00 +02:00
Torkel Ödegaard
4f9f186575 docs: overhauled annotation docs and moved some of the data source specific annotation docs to the respective data source doc pages, closes #1111 2017-04-28 12:51:21 +02:00
Torkel Ödegaard
c46b73538c docs: minor update to troubleshooting guide, closes #8242 2017-04-28 11:16:05 +02:00
Torkel Ödegaard
0ac9ec8f7e docs: added restore instructions to backup section in upgrading doc article, closes #5680 2017-04-28 11:05:14 +02:00
Torkel Ödegaard
26f4a8e5a4 docs: added links to upgrading article 2017-04-28 10:58:26 +02:00
Torkel Ödegaard
a93fa0acde docs: Added general upgrading docs / guide, closes #5905 2017-04-28 10:52:50 +02:00
Torkel Ödegaard
b14c3d63e4 docs: added missing white space to config docs, #7073 2017-04-28 09:21:47 +02:00
Torkel Ödegaard
24e3777894 docs: updated make file for docs to support specifying env and version 2017-04-27 12:17:22 +02:00
Torkel Ödegaard
f5a6c306a6 docs: worked on supporting doc versions 2017-04-27 09:58:45 +02:00
Daniel Lee
8f4c797399 docs: update graph docs images + some text changes 2017-04-26 13:19:24 +02:00
Torkel Ödegaard
9e13c93379 docs: fixed redirects to panel docs for old location, caused by move in bd414c1793 2017-04-26 13:01:12 +02:00
Tyghe Vallard
1edeaa5e7e duplicate keys for auth.github for allow_sign_up 2017-04-25 11:11:32 -05:00
Daniel Lee
6538e86793 webdav: add tests + path.join for public url param 
Fixes #7914. Fixes #7921
 2017-04-25 17:22:18 +02:00
fir4
6d9e8bd147 webdav: allow specification of a different public_url than upload url 2017-04-25 17:22:18 +02:00
Torkel Ödegaard
fe64ed424e docs: removed deprecated api #8210 2017-04-25 16:17:05 +02:00
Daniel Lee
1bbc149089 docs: document API calls for /auth/keys 2017-04-20 13:59:36 +02:00
Daniel Lee
459d195291 docs: fix link 2017-04-20 13:35:51 +02:00
Daniel Lee
6ec1d16327 fix: cli admin reset-password fixes cmd args 
Fixes the homepath and config command line args. This allows the
command to be used even when the homepath is different from the
default.

Fixes #7730
 2017-04-20 13:30:17 +02:00
raj dutt
98266bd95a Update alerting.md 
typo in API URL
 2017-04-19 13:19:01 -04:00
Torkel Ödegaard
9c246ba301 docs: fixed http docs for alert notifications, fixes #8105 2017-04-12 20:57:22 +02:00
Torkel Ödegaard
09cec3118f docs: updated go and node version requirements for building, fixes #8097 2017-04-12 06:39:26 +02:00
Daniel Lee
2877ad1a7d docs: manual installation of plugins 2017-04-10 15:01:40 +02:00
wrp
c219498aab Fix typo: "your" -> "your're" (#8064) 2017-04-07 09:29:46 +02:00
Calle Pettersson
a79102b42d Fix ldap ca_cert example/docs for proper syntax (#8044) 2017-04-06 09:53:11 +02:00
Kazumasa Kohtaka
aada5181fa docs: fix typo in a section describing search API (#7984) 2017-03-30 08:54:32 +02:00
Seuf
319b8d8fca Configurable signout menu activation (#7968) 2017-03-29 11:33:28 +02:00
Torkel Ödegaard
98554e9fbe docs: added config entry for ldap allow_sign_up option, #7972 2017-03-29 08:42:10 +02:00
crmacleo
54883e09d5 docs: fix some spelling/grammar/wording issues 2017-03-26 17:27:19 -07:00
Daniel Lee
44c9ba2edf docs: add query parameter to api user search 
ref #7469
 2017-03-23 18:09:14 +01:00
Torkel Ödegaard
b404f32a09 docs: updated download links 2017-03-22 14:26:57 +01:00
Daniel Lee
69bec98962 chore: update all grafana.org urls to .com 2017-03-21 15:37:55 +01:00
Torkel Ödegaard
adf7645bf5 docs: added alias 2017-03-20 16:04:57 +01:00
Torkel Ödegaard
4d4e165be7 links: updated links from grafana.net to grafana.com 2017-03-20 10:20:32 +01:00
Jens L
5785bfe0cc Add more information for generic oauth2 (#7880) 
Add reference to OpenID's userinfo_endpoint (as in #6351)
 2017-03-20 08:36:43 +01:00
Torkel Ödegaard
50718b592c docs: added aliases 2017-03-18 08:25:26 +01:00
Dan Cech
51bdb60296 fix docs.grafana.org/plugins 2017-03-17 18:41:02 -04:00
Torkel Ödegaard
aaf013b360 Merge branch 'master' of github.com:grafana/grafana 2017-03-17 19:33:38 +01:00
Torkel Ödegaard
19516ebcce docs: minor fix 2017-03-17 19:33:31 +01:00
Gregory Kman
e9ad71abed Update alerting.md 
Add missing `"`
 2017-03-15 12:00:03 -05:00
Torkel Ödegaard
b471e7e448 updated 2017-03-13 20:17:46 +01:00
Torkel Ödegaard
25318f5848 Merge branch 'master' into rebrand-docs 2017-03-11 12:36:58 +01:00
Torkel Ödegaard
6af62abd41 docs(): added router_logging to configuration options, closes #7723 2017-03-06 08:26:36 +01:00
bergquist
473513aa2f docs: how to configure alert notification links 2017-03-01 17:19:34 +01:00
Rickard von Essen
573bcdde12 Added some details about Sessions in Postgres 2017-03-01 11:35:12 +01:00
bergquist
86789c0b69 docs: update docs for 4.2.0 beta release 2017-02-27 12:44:55 +01:00
Torkel Ödegaard
e3b71ed95e docs(): updated CLA 2017-02-22 09:10:08 +01:00
Torkel Ödegaard
9c84b9f944 docs(): CLA fixes 2017-02-22 08:55:24 +01:00
Daniel Lee
96a3ed0ac3 docs: new /api/users/search route 
ref #7469. Description of new route that
adds paging for the users list.
 2017-02-21 16:09:15 +01:00
Aaron Roydhouse
4039e5edbc Improve 'external_image_storage.s3' documentation (#7623) 
Add documentation for 'external_image_storage.s3' to explain how to specify the AWS region for the S3 bucket, and the requires S3/IAM permissions.
 2017-02-21 10:09:50 +01:00
Torkel Ödegaard
1d9b3871fa Merge branch 'rebrand-docs' of github.com:grafana/grafana into rebrand-docs 2017-02-20 12:12:47 +01:00
Torkel Ödegaard
bc9165bdfc Merge branch 'master' into rebrand-docs 2017-02-20 12:11:22 +01:00
Torkel Ödegaard
b176f36889 docs(): updated CLA 2017-02-20 10:41:13 +01:00
bergquist
79daa71350 docs: update golang requirement to 1.8 2017-02-17 10:37:59 +01:00
bergquist
c8c3021987 docs: tutorial for setting up grafana as HA 
ref #7541
 2017-02-15 12:38:50 +01:00
Daniel Lee
6dfdcd7ca5 email: change default from name to Grafana 
Changes default from name in smtp settings
from Grafana Admin to Grafana.

Fix for integration test (which is skipped but that
did not work)
 2017-02-15 11:02:46 +01:00