]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/dashboard: use grafana server instead of grafana-server in grafana
authorAashish Sharma <aasharma@li-e74156cc-2f67-11b2-a85c-e98659a63c5c.ibm.com>
Fri, 12 Apr 2024 12:32:25 +0000 (18:02 +0530)
committerAashish Sharma <aasharma@li-e74156cc-2f67-11b2-a85c-e98659a63c5c.ibm.com>
Wed, 24 Jul 2024 09:21:12 +0000 (14:51 +0530)
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 <aasharma@redhat.com>
src/cephadm/cephadm.py

index 5deaec55949c8bf1c29d0174f407a06a556b9664..a48576bdc9c6ba18f1c328ca7fb0aaeb8bd44d3b 100755 (executable)
@@ -3541,7 +3541,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 '):
@@ -4044,7 +4044,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(