From 44df72357c8472fa8a024b72dbe1fd99850e5e32 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 20 Feb 2020 22:13:19 +0800 Subject: [PATCH 1/2] rpm,deb: s/plugin/module/ Signed-off-by: Kefu Chai --- ceph.spec.in | 20 ++++++++++---------- debian/control | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 18542f83fdd..0dffe719b30 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -546,13 +546,13 @@ Requires: pyOpenSSL Requires: python%{python3_pkgversion}-pyOpenSSL %endif %description mgr-dashboard -ceph-mgr-dashboard is a manager plugin, providing a web-based application +ceph-mgr-dashboard is a manager module, providing a web-based application to monitor and manage many aspects of a Ceph cluster and related components. See the Dashboard documentation at http://docs.ceph.com/ for details and a detailed feature overview. %package mgr-diskprediction-local -Summary: Ceph Manager plugin for predicting disk failures +Summary: Ceph Manager module for predicting disk failures BuildArch: noarch %if 0%{?suse_version} Group: System/Filesystems @@ -565,11 +565,11 @@ Requires: numpy Requires: scipy %endif %description mgr-diskprediction-local -ceph-mgr-diskprediction-local is a ceph-mgr plugin that tries to predict +ceph-mgr-diskprediction-local is a ceph-mgr module that tries to predict disk failures using local algorithms and machine-learning databases. %package mgr-diskprediction-cloud -Summary: Ceph Manager plugin for cloud-based disk failure prediction +Summary: Ceph Manager module for cloud-based disk failure prediction BuildArch: noarch %if 0%{?suse_version} Group: System/Filesystems @@ -583,12 +583,12 @@ Requires: python2-grpcio Requires: python2-protobuf %endif %description mgr-diskprediction-cloud -ceph-mgr-diskprediction-cloud is a ceph-mgr plugin that tries to predict +ceph-mgr-diskprediction-cloud is a ceph-mgr module that tries to predict disk failures using services in the Google cloud. %package mgr-rook BuildArch: noarch -Summary: Ceph Manager plugin for Rook-based orchestration +Summary: Ceph Manager module for Rook-based orchestration %if 0%{?suse_version} Group: System/Filesystems %endif @@ -596,23 +596,23 @@ Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-kubernetes Requires: python%{python3_pkgversion}-jsonpatch %description mgr-rook -ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using +ceph-mgr-rook is a ceph-mgr module for orchestration functions using a Rook backend. %package mgr-k8sevents BuildArch: noarch -Summary: Ceph Manager plugin to orchestrate ceph-events to kubernetes' events API +Summary: Ceph Manager module to orchestrate ceph-events to kubernetes' events API %if 0%{?suse_version} Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-kubernetes %description mgr-k8sevents -ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events +ceph-mgr-k8sevents is a ceph-mgr module that sends every ceph-events to kubernetes' events API %package mgr-cephadm -Summary: Ceph Manager plugin for cephadm-based orchestration +Summary: Ceph Manager module for cephadm-based orchestration BuildArch: noarch %if 0%{?suse_version} Group: System/Filesystems diff --git a/debian/control b/debian/control index 4d336b1f4cd..acb89afec8a 100644 --- a/debian/control +++ b/debian/control @@ -251,12 +251,12 @@ Depends: ceph-mgr (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, -Description: dashboard plugin for ceph-mgr +Description: dashboard module for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - This package provides a ceph-mgr plugin, providing a web-based + This package provides a ceph-mgr module, providing a web-based application to monitor and manage many aspects of a Ceph cluster and related components. . @@ -272,12 +272,12 @@ Depends: ceph-mgr (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, -Description: diskprediction-local plugin for ceph-mgr +Description: diskprediction-local module for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - This package contains the diskprediction_local plugin for the ceph-mgr + This package contains the diskprediction_local module for the ceph-mgr daemon, which helps predict disk failures. Package: ceph-mgr-diskprediction-cloud @@ -286,12 +286,12 @@ Depends: ceph-mgr (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, -Description: diskprediction-cloud plugin for ceph-mgr +Description: diskprediction-cloud module for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - This package contains the diskprediction_cloud plugin for the ceph-mgr + This package contains the diskprediction_cloud module for the ceph-mgr daemon, which helps predict disk failures. Package: ceph-mgr-rook @@ -302,12 +302,12 @@ Depends: ceph-mgr (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, -Description: rook plugin for ceph-mgr +Description: rook module for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - This package contains the rook plugin for ceph-mgr's orchestration + This package contains the rook module for ceph-mgr's orchestration functionality, to allow ceph-mgr to install and configure ceph using Rook. @@ -317,12 +317,12 @@ Depends: ceph-mgr (= ${binary:Version}), python3-kubernetes, ${misc:Depends}, ${python:Depends}, -Description: kubernetes events plugin for ceph-mgr +Description: kubernetes events module for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - This package contains the k8sevents plugin, to allow ceph-mgr to send + This package contains the k8sevents module, to allow ceph-mgr to send ceph related events to the kubernetes events API, and track all events that occur within the rook-ceph namespace. @@ -334,12 +334,12 @@ Depends: ceph-mgr (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, openssh-client -Description: cephadm orchestrator plugin for ceph-mgr +Description: cephadm orchestrator module for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - This package contains the CEPHADM plugin for ceph-mgr's orchestration + This package contains the CEPHADM module for ceph-mgr's orchestration functionality, to allow ceph-mgr to perform orchestration functions over a standard SSH connection. From 27550242d4ba806341b21328890cdc752a5b3e63 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 20 Feb 2020 22:15:06 +0800 Subject: [PATCH 2/2] doc/mgr/dashboard.rst: s/plugin/module/ Signed-off-by: Kefu Chai --- doc/mgr/dashboard.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mgr/dashboard.rst b/doc/mgr/dashboard.rst index 8ee2c548bd3..01ab5bef2c6 100644 --- a/doc/mgr/dashboard.rst +++ b/doc/mgr/dashboard.rst @@ -19,7 +19,7 @@ prefer a WebUI over using the command line. The new :term:`Ceph Dashboard` module is a replacement of the previous one and adds a built-in web based monitoring and administration application to the Ceph -Manager. The architecture and functionality of this new plugin is derived from +Manager. The architecture and functionality of this new module is derived from and inspired by the `openATTIC Ceph management and monitoring tool `_. The development is actively driven by the team behind openATTIC at `SUSE `_, with a lot of support from