diff options
| author | Adam King <47704447+adk3798@users.noreply.github.com> | 2024-09-10 15:59:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-10 15:59:39 +0200 |
| commit | 93cd8582ff35efaddda7d6e82855c7b544761460 (patch) | |
| tree | 912cbf69c537528cdbb0b4bc68451f45fe584625 /src/cephadm | |
| parent | Merge pull request #59610 from adk3798/cephadm-ssh-configurable-keepalive (diff) | |
| parent | mgr/dashboard: use grafana server instead of grafana-server in grafana (diff) | |
| download | ceph-93cd8582ff35efaddda7d6e82855c7b544761460.tar.xz ceph-93cd8582ff35efaddda7d6e82855c7b544761460.zip | |
Merge pull request #56858 from rhcs-dashboard/fix-grafana-server-depreciation
mgr/dashboard: use grafana server instead of grafana-server in grafana 10.4.0
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@ibm.com>
Diffstat (limited to 'src/cephadm')
| -rwxr-xr-x | src/cephadm/cephadm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index e71addf7bfa..31345820446 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -3568,7 +3568,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 '): @@ -4074,7 +4074,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( |