From: Dmitriy Rabotjagov <dmitriy.r@sitevalley.com>
Date: Tue, 29 Jan 2019 11:11:32 +0000 (+0200)
Subject: mgr/zabbix Changed application_prototype naming convention
X-Git-Tag: v15.1.0~2751^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d030287329eae03ee53d1d0e5ca59a6a966e32a;p=ceph.git

mgr/zabbix Changed application_prototype naming convention

application_prototypes were named not as obvious as they could be,
so changed them from "Ceph {#CRUSH_RULE}" to "Ceph CRUSH [{#CRUSH_RULE}]"
to make name of crush policy more visable and easier to select by regexp.

Also discoverable items have been removed from regular Ceph application

Signed-off-by: Dmitriy Rabotjagov <noonedeadpunk@ya.ru>
---

diff --git a/doc/mgr/zabbix.rst b/doc/mgr/zabbix.rst
index 62f513fd58a..ba0eadd5837 100644
--- a/doc/mgr/zabbix.rst
+++ b/doc/mgr/zabbix.rst
@@ -114,7 +114,7 @@ This can be done with this command:
 
 The module will now send its latest data to the Zabbix server.
 
-Items discovery is accomplished also via sabbix_sender, and runs every `discovery_interval * interval` seconds. If you wish to launch discovery 
+Items discovery is accomplished also via zabbix_sender, and runs every `discovery_interval * interval` seconds. If you wish to launch discovery 
 manually, this can be done with this command:
 
 ::
diff --git a/src/pybind/mgr/zabbix/zabbix_template.xml b/src/pybind/mgr/zabbix/zabbix_template.xml
index 4d005280d37..40627eb86b0 100644
--- a/src/pybind/mgr/zabbix/zabbix_template.xml
+++ b/src/pybind/mgr/zabbix/zabbix_template.xml
@@ -2025,18 +2025,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2074,18 +2070,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2123,18 +2115,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2172,18 +2160,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2221,18 +2205,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2270,18 +2250,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2406,18 +2382,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2455,18 +2427,14 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing/>
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2504,11 +2472,7 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing>
@@ -2520,7 +2484,7 @@
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2558,11 +2522,7 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing>
@@ -2574,7 +2534,7 @@
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2612,11 +2572,7 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing>
@@ -2628,7 +2584,7 @@
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>
@@ -2666,11 +2622,7 @@
                             <port/>
                             <description/>
                             <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Ceph</name>
-                                </application>
-                            </applications>
+                            <applications/>
                             <valuemap/>
                             <logtimefmt/>
                             <preprocessing>
@@ -2682,7 +2634,7 @@
                             <jmx_endpoint/>
                             <application_prototypes>
                                 <application_prototype>
-                                    <name>Ceph {#CRUSH_RULE}</name>
+                                    <name>Ceph CRUSH [{#CRUSH_RULE}]</name>
                                 </application_prototype>
                             </application_prototypes>
                             <master_item_prototype/>