From: Aashish Sharma Date: Fri, 12 Apr 2024 12:32:25 +0000 (+0530) Subject: mgr/dashboard: use grafana server instead of grafana-server in grafana X-Git-Tag: v19.2.1~217^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F59722%2Fhead;p=ceph.git mgr/dashboard: use grafana server instead of grafana-server in grafana 10.4.0 The grafana-server command is deprecated in grafana v10.4.0. It is advised to use grafan server in place of it Fixes: https://tracker.ceph.com/issues/65479 Signed-off-by: Aashish Sharma (cherry picked from commit ba7b6ec215701d17295b751835d29b18950be960) --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index b47ab138a0b2..075e6dcedda8 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -3533,7 +3533,7 @@ def list_daemons( elif daemon_type == 'grafana': out, err, code = call(ctx, [container_path, 'exec', container_id, - 'grafana-server', '-v'], + 'grafana', 'server', '-v'], verbosity=CallVerbosity.QUIET) if not code and \ out.startswith('Version '): @@ -4033,7 +4033,7 @@ def command_adopt_grafana(ctx, daemon_id, fsid): ports = Monitoring.port_map['grafana'] endpoints = [EndPoint('0.0.0.0', p) for p in ports] - _stop_and_disable(ctx, 'grafana-server') + _stop_and_disable(ctx, 'grafana server') ident = DaemonIdentity(fsid, daemon_type, daemon_id) data_dir_dst = make_data_dir(