Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 8187eb9)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 75cf5fc)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 15e4b78)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0b3943a)

Adjusted so Ubuntu command uses 'apt' and added Fedora since that uses 'dnf'.

(cherry picked from commit ffc08b9)

introduced by:
cd79c99

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit b58b0de)

`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>
(cherry picked from commit b4b6f35)

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>
(cherry picked from commit 9441d66)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a52bd99)

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 0a139c1)

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 6ccc3d8)

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 04a3d4c)

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit dbdd4d4)

This hunk is from aca45d7, a much
larger change in master that added type annotations all over the place.
It just brings src/pybind/mgr/cephadm fully in sync with master.

Signed-off-by: Sage Weil <sage@newdream.net>

The first get-or-create attempt also needs to tolerate failure.

Fixes: 8ceea19

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 19c7523)

Introduces metric `prometheus_collect_duration_seconds` for the time it
takes the Prometheus manager module to collect all the metrics.

```
ceph_prometheus_collect_duration_seconds_sum{method="get_health"} 0.0002613067626953125
ceph_prometheus_collect_duration_seconds_sum{method="get_pool_stats"} 0.0018298625946044922
ceph_prometheus_collect_duration_seconds_sum{method="get_df"} 0.0005767345428466797
ceph_prometheus_collect_duration_seconds_sum{method="get_fs"} 0.0010402202606201172
ceph_prometheus_collect_duration_seconds_sum{method="get_quorum_status"} 0.0007524490356445312
ceph_prometheus_collect_duration_seconds_sum{method="get_mgr_status"} 0.0035364627838134766
ceph_prometheus_collect_duration_seconds_sum{method="get_pg_status"} 0.00021266937255859375
ceph_prometheus_collect_duration_seconds_sum{method="get_osd_stats"} 0.0018737316131591797
ceph_prometheus_collect_duration_seconds_sum{method="get_metadata_and_osd_status"} 0.0032796859741210938
ceph_prometheus_collect_duration_seconds_sum{method="get_num_objects"} 0.00011086463928222656
ceph_prometheus_collect_duration_seconds_sum{method="get_rbd_stats"} 0.00036144256591796875
ceph_prometheus_collect_duration_seconds_count{method="get_health"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_pool_stats"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_df"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_fs"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_quorum_status"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_mgr_status"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_pg_status"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_osd_stats"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_metadata_and_osd_status"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_num_objects"} 1.0
ceph_prometheus_collect_duration_seconds_count{method="get_rbd_stats"} 1.0
```

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

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 801d3f6)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 58fd057)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e69aad6)

# Conflicts:
#	src/pybind/mgr/tox.ini
  - pacific telemetry not in tox.ini

so we don't need to worry about escaping the backslash anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 734dd75)

for the explanation why we should add a line break before a binary
operator. see
https://www.python.org/dev/peps/pep-0008/#should-a-line-break-before-or-after-a-binary-operator

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5dd9db9)

update to adapt the type annotation of MgrModule.list_servers()

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 19abd1e)

# Conflicts:
#	src/pybind/mgr/telemetry/module.py
  - drop telemetry portion

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3b9ecd1)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f92aa2f)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7f43844)

# Conflicts:
#	src/mypy.ini
  - surrounding modules are in master but not pacific

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 806ef8a)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 48b70f2)

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 0fdbdb4)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b67e434)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3649ecf)