From abf9d35aaa5c93c22c3abb29ea61ba89143306a4 Mon Sep 17 00:00:00 2001 From: Tatjana Dehler Date: Thu, 28 Jun 2018 16:08:23 +0200 Subject: [PATCH] mgr/dashboard: add flag info to config options documentation page Add information about the supported flags (introduced by https://github.com/ceph/ceph/pull/22595) to the config options documentation page. Fixes: https://tracker.ceph.com/issues/24605 Signed-off-by: Tatjana Dehler --- .../configuration/configuration.component.html | 9 +++++++++ .../configuration/configuration.component.ts | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html index 9e7c64082b4..834a21479d0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html @@ -35,4 +35,13 @@ + + + + + {{ flag | uppercase }}{{ !isLast ? "," : "" }}
+
+
+
+
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts index ef06274935b..5a6dc0eac9e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts @@ -62,8 +62,19 @@ export class ConfigurationComponent implements OnInit { } } ]; + flags = { + runtime: 'The value can be updated at runtime.', + no_mon_update: + 'Daemons/clients do not pull this value from the monitor config database. ' + + 'We disallow setting this option via \'ceph config set ...\'. This option should be ' + + 'configured via ceph.conf or via the command line.', + startup: 'Option takes effect only during daemon startup.', + cluster_create: 'Option only affects cluster creation.', + create: 'Option only affects daemon creation.' + }; @ViewChild('confValTpl') public confValTpl: TemplateRef; + @ViewChild('confFlagTpl') public confFlagTpl: TemplateRef; constructor(private configurationService: ConfigurationService) {} @@ -80,6 +91,13 @@ export class ConfigurationComponent implements OnInit { { flexGrow: 1, prop: 'source' }, { flexGrow: 2, prop: 'desc', name: 'Description', cellClass: 'wrap' }, { flexGrow: 2, prop: 'long_desc', name: 'Long description', cellClass: 'wrap' }, + { + flexGrow: 2, + prop: 'flags', + name: 'Flags', + cellClass: 'wrap', + cellTemplate: this.confFlagTpl + }, { flexGrow: 1, prop: 'type' }, { flexGrow: 1, prop: 'level' }, { flexGrow: 1, prop: 'default', cellClass: 'wrap' }, -- 2.39.5