Module: check_mk
Branch: master
Commit: df52723d472f781d193d66f7b0908cfe48faed89
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df52723d472f78…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Wed Oct 28 13:44:41 2015 +0100
Some cleanup in the manpage catalog
---
checkman/kaspersky_av_client | 2 +-
checkman/mcafee_av_client | 2 +-
checkman/oracle_diva_csm | 2 +-
checkman/oracle_diva_csm.actor | 2 +-
checkman/oracle_diva_csm.archive | 2 +-
checkman/oracle_diva_csm.drive | 2 +-
checkman/oracle_diva_csm.objects | 2 +-
checkman/oracle_diva_csm.tapes | 2 +-
modules/catalog.py | 3 +++
9 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/checkman/kaspersky_av_client b/checkman/kaspersky_av_client
index 5db6a17..be56b63 100644
--- a/checkman/kaspersky_av_client
+++ b/checkman/kaspersky_av_client
@@ -1,6 +1,6 @@
title: Kaspersky Anti-Virus: Signature and Fullscan
agents: windows
-catalog: app/
+catalog: app/kaspersky
license: GPL
distribution: check_mk
description:
diff --git a/checkman/mcafee_av_client b/checkman/mcafee_av_client
index 808c185..69a4bb3 100644
--- a/checkman/mcafee_av_client
+++ b/checkman/mcafee_av_client
@@ -1,6 +1,6 @@
title: McAfee Anti-Virus Signature Date
agents: windows
-catalog: app/kaspersky
+catalog: app/mcafee
license: GPL
distribution: check_mk
description:
diff --git a/checkman/oracle_diva_csm b/checkman/oracle_diva_csm
index ec01c96..97932cc 100644
--- a/checkman/oracle_diva_csm
+++ b/checkman/oracle_diva_csm
@@ -1,6 +1,6 @@
title: DIVA Content Storage Management: Library Status
agents: snmp
-catalog: hw/storagehw/oracle
+catalog: hw/storagehw/oraclehw
license: GPL
distribution: check_mk
description:
diff --git a/checkman/oracle_diva_csm.actor b/checkman/oracle_diva_csm.actor
index d115c4c..bdbd915 100644
--- a/checkman/oracle_diva_csm.actor
+++ b/checkman/oracle_diva_csm.actor
@@ -1,6 +1,6 @@
title: DIVA Content Storage Management: Actor Status
agents: snmp
-catalog: hw/storagehw/oracle
+catalog: hw/storagehw/oraclehw
license: GPL
distribution: check_mk
description:
diff --git a/checkman/oracle_diva_csm.archive b/checkman/oracle_diva_csm.archive
index f9b1e8c..946c650 100644
--- a/checkman/oracle_diva_csm.archive
+++ b/checkman/oracle_diva_csm.archive
@@ -1,6 +1,6 @@
title: DIVA Content Storage Management: Archive Status
agents: snmp
-catalog: hw/storagehw/oracle
+catalog: hw/storagehw/oraclehw
license: GPL
distribution: check_mk
description:
diff --git a/checkman/oracle_diva_csm.drive b/checkman/oracle_diva_csm.drive
index 083936a..4c4d083 100644
--- a/checkman/oracle_diva_csm.drive
+++ b/checkman/oracle_diva_csm.drive
@@ -1,6 +1,6 @@
title: DIVA Content Storage Management: Drive Status
agents: snmp
-catalog: hw/storagehw/oracle
+catalog: hw/storagehw/oraclehw
license: GPL
distribution: check_mk
description:
diff --git a/checkman/oracle_diva_csm.objects b/checkman/oracle_diva_csm.objects
index 7b63e43..a2285aa 100644
--- a/checkman/oracle_diva_csm.objects
+++ b/checkman/oracle_diva_csm.objects
@@ -1,6 +1,6 @@
title: DIVA Content Storage Management: Objects
agents: snmp
-catalog: hw/storagehw/oracle
+catalog: hw/storagehw/oraclehw
license: GPL
distribution: check_mk
description:
diff --git a/checkman/oracle_diva_csm.tapes b/checkman/oracle_diva_csm.tapes
index 199a0e0..6e4cedb 100644
--- a/checkman/oracle_diva_csm.tapes
+++ b/checkman/oracle_diva_csm.tapes
@@ -1,6 +1,6 @@
title: DIVA Content Storage Management: Blank Tapes
agents: snmp
-catalog: hw/storagehw/oracle
+catalog: hw/storagehw/oraclehw
license: GPL
distribution: check_mk
description:
diff --git a/modules/catalog.py b/modules/catalog.py
index 6900d46..f613a02 100644
--- a/modules/catalog.py
+++ b/modules/catalog.py
@@ -96,6 +96,7 @@ manpage_catalog_titles = {
"emc" : "EMC",
"qlogic" : "QLogic",
"quantum" : "Quantum",
+ "oraclehw" : "ORACLE",
"phone" : "Telephony",
"app" : "Applications",
@@ -125,6 +126,8 @@ manpage_catalog_titles = {
"tsm" : "IBM Tivoli Storage Manager (TSM)",
"unitrends" : "Unitrends",
"sansymphony" : "Datacore SANsymphony",
+ "kaspersky" : "Kaspersky Lab",
+ "mcafee" : "McAfee",
"os" : "Operating Systems",
"aix" : "AIX",