From: Lenz Grimmer Date: Wed, 6 Feb 2019 15:41:49 +0000 (+0100) Subject: Merge pull request #25918 from rjfd/wip-dashboard-nfs-backend X-Git-Tag: v14.1.0~199 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2275a41d09c76ef73debcee02ff34b870458ab21;p=ceph.git Merge pull request #25918 from rjfd/wip-dashboard-nfs-backend mgr/dashboard: NFS Ganesha management REST API Reviewed-by: Jeff Layton Reviewed-by: Tiago Melo --- 2275a41d09c76ef73debcee02ff34b870458ab21 diff --cc src/pybind/mgr/dashboard/security.py index 501c07f1789a,ad92214fe42a..cbeda6daec22 --- a/src/pybind/mgr/dashboard/security.py +++ b/src/pybind/mgr/dashboard/security.py @@@ -23,9 -23,9 +23,10 @@@ class Scope(object) MANAGER = "manager" LOG = "log" GRAFANA = "grafana" + PROMETHEUS = "prometheus" USER = "user" DASHBOARD_SETTINGS = "dashboard-settings" + NFS_GANESHA = "nfs-ganesha" @classmethod def all_scopes(cls):