1
0
mirror of https://github.com/ceph/ceph synced 2024-12-26 05:25:09 +00:00
Commit Graph

28 Commits

Author SHA1 Message Date
Sebastian Wagner
de653833d1
Merge pull request from zdover23/wip-doc-cephadm-monitoring-deploying-monitoring-second-half-2021-05-10
doc/cephadm: rewrite "deploy. mon. w/cephadm" 2/2

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-06-11 10:45:47 +02:00
Sebastian Wagner
c64a6e9534
Merge pull request from zdover23/wip-doc-cephadm-monitoring-deploying-monitoring-first-half-2021-05-10
doc/cephadm: rewrite "deploy. mon. w/cephadm"

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-06-11 10:45:04 +02:00
Daniel Pivonka
adecb2d2da mgr/cephadm: allow monitoring stack services to bind to network and port
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
2021-06-04 13:49:05 -04:00
Sebastian Wagner
674d6d96da
Merge pull request from adk3798/change-mon-stack-images-docs
doc/cephadm: recommend redeploying monitoring stack daemon after changing image

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-05-27 11:54:24 +02:00
zdover23
3b787771ec
Merge pull request from zdover23/wip-doc-cephadm-monitoring-disabling-monitoring-2021-05-12
doc/cephadm: rewrite "disabling monitoring"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-05-14 00:23:57 +10:00
Zac Dover
b67b6112ac doc/cephadm: rewrite "disabling monitoring"
* Simplified the text.
* Correctly formatted the prompts.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-12 22:54:54 +10:00
Adam King
9be84658fb doc/cephadm: recommend redeploying monitoring stack daemon after changing image
Fixes: https://tracker.ceph.com/issues/50687

Signed-off-by: Adam King <adking@redhat.com>
2021-05-11 14:16:25 -04:00
Zac Dover
808c91233c doc/cephadm: rewrite "deploy. mon. w/cephadm" 2/2
This is the second half of PR#41241.

This PR creates a sub-subsection that explains
a configuration step that is sometimes necessary
when configuring monitoring in Ceph clusters. (The
configuration step involves DNS zones.)

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-11 22:50:20 +10:00
Zac Dover
b9554b0840 doc/cephadm: rewrite "config ssl/tls f. grafana"
This PR streamlines the grammar in the subsection
called "Configuring SSL/TLS for Grafana" in the
monitoring.rst file. It also corrects the prompt
rst.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-11 09:19:10 +10:00
Zac Dover
e8419b53fb doc/cephadm: rewrite "deploy. mon. w/cephadm"
This PR corrects various minor usage errors in
the subsection "Deploying Monitoring with cephadm"
of the "monitoring" section of the cephadm guide.

It also adds prompts, and cleans up the list rst a
bit.

This is the first of two PRs planned for this section.
The second PR will create a sub-subsection that explains
an additional installation step that is necessary when
a Ceph cluster and a user accessing that cluster are in
different DNS zones. But that's another story, for another
PR.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-10 00:39:47 +10:00
Michael Fritch
9441d66318
doc/cephadm: remove step to restart the mgr
a restart of the mgr does not appear to be necessary
after a `ceph config-key set ...`

Signed-off-by: Michael Fritch <mfritch@suse.com>
2021-03-09 21:06:27 -07:00
Michael Fritch
b4b6f359df
doc/cephadm: use reconfig instead of redeploy
`reconfig` can be used to apply a change to either
the tls/ssl cert or a custom configuration file (j2)

Signed-off-by: Michael Fritch <mfritch@suse.com>
2021-03-09 21:06:20 -07:00
Michael Fritch
b58b0de777
doc/cephadm: update custom j2 config-key name
introduced by:
cd79c9912a

Signed-off-by: Michael Fritch <mfritch@suse.com>
2021-03-09 21:06:12 -07:00
Sebastian Wagner
769642c77d doc/cephadm: rename monitoring chapter title
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-02-26 11:51:29 +01:00
Patrick Seidensal
676f82923d mgr/dashboard: enable different URL for users of browser to Grafana
Fixes: https://tracker.ceph.com/issues/47386

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-12-04 17:08:29 +01:00
Sebastian Wagner
d9879eb001
Merge pull request from p-se/doc-cephadm-custom-monitoring-templates
mgr/cephadm: document setting custom monitoring templates for configuration files

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-11-20 16:15:39 +01:00
Patrick Seidensal
7f5b1d8bfe doc/cephadm: document setting custom monitoring templates
Fixes: https://tracker.ceph.com/issues/47651

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-11-16 11:31:24 +01:00
Patrick Seidensal
344c0a69b3 doc/cepham: instructions for custom Grafana TLS certs
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-11-16 11:24:26 +01:00
Kefu Chai
967104103c doc/cephadm: use appropriate directive for formatting codeblocks
Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-09-17 23:42:27 +08:00
Patrick Seidensal
d6369ac159 mgr/dashboard: revise monitoring documentation
Fixes: https://tracker.ceph.com/issues/45406

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-06-22 11:55:29 +02:00
Sebastian Wagner
61847ab200
Merge pull request from p-se/wip-pse-cephadm-custom-monitoring-images
mgr/cephadm: allow custom images for grafana, prometheus, alertmanager and node_exporter
2020-05-27 18:12:05 +02:00
Patrick Seidensal
5d601bc781 mgr/cephadm: custom images for monitoring components
Namely,
- Grafana
- Prometheus
- Alertmanager and
- Node exporter.

Fixes: https://tracker.ceph.com/issues/45463

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-05-26 12:49:34 +02:00
Patrick Seidensal
34765e9215 mgr/dashboard: document Prometheus' security model
Fixes: https://tracker.ceph.com/issues/45377

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-05-25 16:50:53 +02:00
Lenz Grimmer
9334471340
Merge pull request from SchoolGuy/monitoring/rbd-image-details
mgr/dashboard/grafana: Add rbd-image details dashboard

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-05-04 09:59:53 +02:00
Enno G
6386095e51
doc: Add information on how to enable the rbd-images dashboard
Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>

In the previous commit (1c52ee2b) the added dashboard will stay empty
until it is manually enabled to display information.
2020-03-26 08:21:30 +01:00
Sage Weil
7957655227 cephadm: bootstrap: deploy monitoring stack by default
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-16 12:39:44 -05:00
Sage Weil
49143d6578 python-common: 'all:true' -> '*'
'all:true' is no longer a valid PlacementSpec.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-14 09:52:08 -05:00
Sage Weil
739c23da1b doc/cephadm/monitoring: document process to set up monitoring with cephadm
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-06 11:30:18 -06:00