cephadm,servicemap: fix rbd-mirror, cephfs-mirror, rgw servicemap identification; adjust servicemap reporting #40220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liewegas
changed the title
vshankar
previously requested changes
Mar 18, 2021
leseb
reviewed
Mar 18, 2021
Broken by 8fa941b Signed-off-by: Sage Weil <sage@newdream.net>
liewegas
force-pushed
the
cephfs-mirror-servicemap
branch
from
7b46a6f
to
30d87f3
Compare
liewegas
changed the title
|
Registering by gid allows multiple radosgw instances to share an auth key/identity. Including the id in the metadata allows them to still be identified by name (even if not uniquely). Signed-off-by: Sage Weil <sage@newdream.net>
liewegas
force-pushed
the
cephfs-mirror-servicemap
branch
from
3f70cca
to
fec3a8e
Compare
3 tasks
liewegas
changed the title
- Do not list individual daemon ids as this won't scale for larger
clusters
- Do not contemplate multile daemons of the same type that register with
different "daemon_type" -- not until we actually have any that do that.
- Present counts by various groupings: distinct hosts and rgw zones to
start.
services:
mon: 1 daemons, quorum a (age 4m)
mgr: x(active, since 3m)
osd: 1 osds: 1 up (since 3m), 1 in (since 3m)
cephfs-mirror: 1 daemon active (1 hosts)
rbd-mirror: 2 daemons active (1 hosts)
rgw: 2 daemons active (1 hosts, 1 zones)
Signed-off-by: Sage Weil <sage@newdream.net>
Like rbd-mirror, cephfs-mirror and rgw daemons register under their gid. Signed-off-by: Sage Weil <sage@newdream.net>
liewegas
force-pushed
the
cephfs-mirror-servicemap
branch
from
fec3a8e
to
2bd11c4
Compare
|
@lxbsz Is there a case where the same type of daemon will register with different |
cbodley
approved these changes
Mar 19, 2021
No, |
rbd-mirror and cephfs-mirror were already doing the right thing (registering using the gid as the key). |
steveftaylor
pushed a commit
to steveftaylor/ceph
that referenced
this pull request
Mar 23, 2021
…unning. - Adapted code to changes introduced in: ceph#40220 - Improved error handling. - Increased test coverage. - Some refactoring. - Simplified documentation about setting default daemon host and port. Fixes: https://tracker.ceph.com/issues/49655 Signed-off-by: Alfonso Martínez <almartin@redhat.com>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Oct 28, 2021
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit ensures that we get the daemon name from `state->metadata["id"]` if available, and otherwise use `key.name` like before. It restores the correct `ceph_daemon` label for RadosGW, and doesn't change anything for the other daemons. Fixes: https://tracker.ceph.com/issues/51120 Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
3 tasks
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Nov 12, 2021
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Nov 12, 2021
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Nov 12, 2021
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Nov 12, 2021
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Jan 3, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Jan 3, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Jan 4, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Jan 4, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Jan 11, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
BenoitKnecht
added a commit
to BenoitKnecht/ceph
that referenced
this pull request
Jan 11, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
epuertat
pushed a commit
to rhcs-dashboard/ceph
that referenced
this pull request
Feb 4, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 2db1aaa)
epuertat
pushed a commit
to rhcs-dashboard/ceph
that referenced
this pull request
Feb 4, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 01b42c1)
epuertat
pushed a commit
to rhcs-dashboard/ceph
that referenced
this pull request
Feb 9, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 2db1aaa)
epuertat
pushed a commit
to rhcs-dashboard/ceph
that referenced
this pull request
Feb 9, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 01b42c1)
epuertat
pushed a commit
that referenced
this pull request
Mar 22, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since #40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 2db1aaa)
epuertat
pushed a commit
that referenced
this pull request
Mar 22, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before #40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 01b42c1)
zalsader
pushed a commit
to zalsader/ceph
that referenced
this pull request
Apr 11, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
zalsader
pushed a commit
to zalsader/ceph
that referenced
this pull request
Apr 11, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
mchangir
pushed a commit
to mchangir/ceph
that referenced
this pull request
Apr 13, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 2db1aaa)
mchangir
pushed a commit
to mchangir/ceph
that referenced
this pull request
Apr 13, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 01b42c1)
dpaganel
pushed a commit
to dpaganel/ceph
that referenced
this pull request
May 17, 2022
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
dpaganel
pushed a commit
to dpaganel/ceph
that referenced
this pull request
May 17, 2022
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
NitzanMordhai
pushed a commit
to NitzanMordhai/ceph
that referenced
this pull request
Nov 19, 2023
The `DaemonStateCollection` used to always contain the daemon name in its `DaemonKey`, but since ceph#40220 (or more specifically afc3375), the RadosGW registers with its instance ID instead (`rados.get_instance_id()`). As a result, the `ceph_rgw_*` metrics returned by `ceph-mgr` through the `prometheus` module have their `ceph_daemon` label include that ID instead of the daemon name, e.g. ``` ceph_rgw_req{ceph_daemon="rgw.127202"} ``` instead of ``` ceph_rgw_req{ceph_daemon="rgw.my-hostname.rgw0"} ``` This commit adds the daemon name from `state->metadata["id"]` if available, as `service.name` in the JSON document returned by `dump_server()`. Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 2db1aaa)
NitzanMordhai
pushed a commit
to NitzanMordhai/ceph
that referenced
this pull request
Nov 19, 2023
In order to get the `ceph_daemon` label for `rgw` metrics corresponding to the value before ceph#40220, we need to add the `instance_id` label to the `ceph_rgw_metadata` metric. This way, the old `ceph_daemon` label can be added to any `ceph_rgw_*` metric using the following PromQL query, for instance: ``` ceph_rgw_req * on (instance_id) group_left(ceph_daemon) ceph_rgw_metadata ``` Signed-off-by: Benoît Knecht <bknecht@protonmail.ch> (cherry picked from commit 01b42c1)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
idkey with their auth id/nameidkey, if present)ceph -ssummary code to count total daemons and groupings (distinct hosts, zones)