Commit Graph

31 Commits

Author SHA1 Message Date
Sage Weil 66838565bd Merge pull request #17119 from nrdmn/wip-dashboard-httproot
pybind/mgr/dashboard: add url_prefix

Reviewed-by: John Spray <john.spray@redhat.com>
2017-08-29 17:07:41 -05:00
Nick Erdmann 6d285fff0d pybind/mgr/dashboard: add url_prefix
This adds a configuration variable url_prefix to the dashboard that
that is prepended to all URLs so you can access the dashboard at
http://$IP:$PORT/$PREFIX/. This is necessary if you wish to use a
reverse http proxy that forwards to the dashboard under a sub-path.

Fixes: http://tracker.ceph.com/issues/20568
Signed-off-by: Nick Erdmann <n@nirf.de>
2017-08-22 16:14:42 +00:00
Alfredo Deza 309c73e8b0 doc/mgr add a label for the administrator guide
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-21 11:08:08 -04:00
Jan Fajerski 020d4ccb59 doc/mgr/plugins: mgr accessor during init causes exception
Currently calling a mgr accessor during a plugins __init__ method causes
a cyclic locking exception.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2017-08-10 19:01:34 +02:00
Wido den Hollander ef5ff0e4b9
doc: Update mgr doc on how to enable Zabbix module
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-08-07 10:03:10 +02:00
Sage Weil 4eb1a518e3 mon: 'config-key put' -> 'config-key set'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 14:10:08 -04:00
Sage Weil 410ab9a25d Merge pull request #16406 from dmick/wip-mgr-counters
mgr: perf schema fns/change notification and Prometheus plugin

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-21 10:28:53 -05:00
Dan Mick 47726f8b66 doc/mgr: add Prometheus plugin docs
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-07-20 20:25:08 -07:00
Dan Mick 3b1a8a78ac mgr/index.rst: clarify which toplevel items are plugins
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-07-20 20:09:39 -07:00
Dan Mick c40c254cc6 doc/mgr/zabbix.rst: fix subheadings, add subsubheadings
(otherwise subheadings appear as top-level items in the TOC, because
they're marked just like the title)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-07-20 20:09:05 -07:00
John Spray b28c300258 qa/doc: update for "mgr tell" no longer needed
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-19 08:58:40 -04:00
Sage Weil 02a55d3b7f doc/mgr/restful: update
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-11 14:37:43 -04:00
John Spray 5c63bb6b48 Merge pull request #16241 from liewegas/wip-dashboard-default
doc/mgr/dashboard: update dashboard docs to reflect new defaults

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-11 10:13:45 +01:00
Greg Farnum a4b1395419 doc: fix link for ceph-mgr cephx authorization
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-07-10 10:56:53 -07:00
Sage Weil fa8514e22d doc/mgr/dashboard: update dashboard docs to reflect new defaults
Also add not about load balancer.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:48:50 -04:00
Sage Weil 5d71220838 Merge pull request #16198 from tchaikov/wip-doc-fixes
doc: kill sphinx warnings
2017-07-07 21:39:19 -05:00
Kefu Chai 254e07441c doc: kill sphinx warnings
* doc/release-notes.rst: escape asterisks not used for inline emphasis
    fix bad hyper links
* doc/rados/troubleshooting/troubleshooting-osd.rst: escape asterisks
    not used for inline emphasis
* doc/radosgw/index.rst: add orphan docs to toc
* doc/dev/perf_histograms.rst: indent block quote
* doc/install/manual-freebsd-deployment.rst: fix block quotes
* doc/mgr/administrator.rst: escape asterisks not used for inline emphasis
* doc/start/quick-rbd.rst: add missing hyper link target

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-07 11:50:33 +08:00
Sage Weil 3a85938487 Merge pull request #16019 from wido/mgr-plugin-zabbix
mgr: Zabbix monitoring module

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-06 21:38:01 -05:00
Wido den Hollander bcf3a7edcb
mgr: Zabbix monitoring module
This ceph-mgr module will pull various values from the Ceph cluster
and send them to a Zabbix Server using zabbix_sender.

This requires the zabbix_sender executable to be present on the system
running ceph-mgr as it will be invoked to send data to Zabbix.

A Zabbix template can be found in this directory which can be used
to easily get data from your Ceph cluster into Zabbix.

More information is available in the README file found in the module's
directory.

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-07-05 11:06:19 +02:00
Sage Weil 289f5ed093 doc: update docs for enabling mgr modules
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-29 23:10:51 -04:00
Wido den Hollander 0f15e4e76b
doc: Mgr Dashboard docs update
More instructions on how to deploy the dashboard using ceph-mgr

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-06-27 15:42:41 +02:00
Sage Weil 368ff5e4aa Merge pull request #15697 from gregsfortytwo/wip-mgr-eaccss-20296
mgr: print a more helpful error message for when users lack mgr ceph caps

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-19 22:34:35 -05:00
Greg Farnum 6846f4830c mgr: print a more helpful error message for when users lack mgr cephx caps
Add some brief documentation on updating their caps and link to it.

Fixes: http://tracker.ceph.com/issues/20296

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-06-16 18:41:10 -07:00
Kefu Chai 774a856ec2 doc: document the setup of restful and dashboard plugins
Fixes: http://tracker.ceph.com/issues/20239
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 19:13:30 +08:00
John Spray 1cfeff3661 doc/mgr: update for mgr_beacon_period change
This setting got renamed.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-14 10:04:22 -04:00
John Spray fc990666d5 doc/mgr: flesh out introductory text
Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-14 09:54:27 -04:00
John Spray b61f0c0b31 doc/mgr: fix auth keys instruction
This was out of date.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-14 09:54:26 -04:00
John Spray 1dcdf35455 doc/mgr: fix rst syntax in plugin guide
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:30 +00:00
Ken Dreyer be7de7ab0d doc: fix mgr literal block rST syntax
Prior to this change, there were double-colon ("::") characters in the
HTML docs to indicate literal blocks.

The proceeding paragraphs were not pre-formatted because there was no
newline between the double-colon and the to-be-pre-formatted paragraph.

Move the "::" characters inline to simplify the syntax and make Sphinx
properly interpret these texts as literal blocks.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-10-25 19:51:53 -06:00
huanwen ren b7891ee3f2 doc/mgr: fix mgr how long to wait to failover
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-10-19 17:01:28 +08:00
John Spray 567b9fb692 doc: add initial ceph-mgr docs
Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:27:05 +01:00