5 Dec
2018
5 Dec
'18
6:20 a.m.
Module: check_mk
Branch: master
Commit: 30c6788cda7335b20f60251dd7904b3cb371a496
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30c6788cda7335…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Tue Dec 4 15:11:46 2018 +0100
FEED-3144: reorganize plugin catalog
Change-Id: I10cfb0a5d80d690ca77aa255c0525f9a6e682d37
---
checkman/azure_agent_info | 6 +++---
checkman/azure_databases | 4 ++--
checkman/azure_databases.connections | 4 ++--
checkman/azure_databases.cpu | 4 ++--
checkman/azure_databases.deadlock | 4 ++--
checkman/azure_databases.dtu | 4 ++--
checkman/azure_databases.storage | 4 ++--
checkman/azure_sites | 4 ++--
checkman/azure_virtualmachines | 4 ++--
checkman/azure_virtualmachines.summary | 4 ++--
cmk/gui/wato/pages/check_catalog.py | 2 ++
cmk/man_pages.py | 6 ++++--
web/htdocs/images/icon_plugins_cloud.png | Bin 0 -> 4733 bytes
web/htdocs/themes/facelift/images/icon_plugins_cloud.png | Bin 0 -> 921 bytes
14 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/checkman/azure_agent_info b/checkman/azure_agent_info
index 27a1cdc..26178df 100644
--- a/checkman/azure_agent_info
+++ b/checkman/azure_agent_info
@@ -1,6 +1,6 @@
-title: Azure Agent Info
+title: Microsoft Azure Agent Info
agents: linux
-catalog: app/Azure
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
@@ -13,5 +13,5 @@ item:
inventory:
One service is created per monitored resource group and one for the
- host that runs the agent.
+ host that the agent is assigned to.
diff --git a/checkman/azure_databases b/checkman/azure_databases
index 0a90031..dcc9a78 100644
--- a/checkman/azure_databases
+++ b/checkman/azure_databases
@@ -1,6 +1,6 @@
-title: Azure Monitoring: Databases
+title: Microsoft Azure SQL Databases
agents: linux
-catalog: app/databases
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_databases.connections b/checkman/azure_databases.connections
index 4fe7ce9..594e3d2 100644
--- a/checkman/azure_databases.connections
+++ b/checkman/azure_databases.connections
@@ -1,6 +1,6 @@
-title: Azure Monitoring: Database connections
+title: Microsoft Azure SQL Databases: connections
agents: linux
-catalog: app/databases
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_databases.cpu b/checkman/azure_databases.cpu
index 941bd7c..b85d31a 100644
--- a/checkman/azure_databases.cpu
+++ b/checkman/azure_databases.cpu
@@ -1,6 +1,6 @@
-title: Azure Monitoring: Database CPU utilization
+title: Microsoft Azure SQL Databases: CPU utilization
agents: linux
-catalog: app/databases
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_databases.deadlock b/checkman/azure_databases.deadlock
index a90e4c7..b73f3d7 100644
--- a/checkman/azure_databases.deadlock
+++ b/checkman/azure_databases.deadlock
@@ -1,6 +1,6 @@
-title: Azure Monitoring: Database deadlocks
+title: Microsoft Azure SQL Databases: deadlocks
agents: linux
-catalog: app/databases
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_databases.dtu b/checkman/azure_databases.dtu
index b7ecef2..6b2b5f5 100644
--- a/checkman/azure_databases.dtu
+++ b/checkman/azure_databases.dtu
@@ -1,6 +1,6 @@
-title: Azure Monitoring: Database throughput units
+title: Microsoft Azure SQL Databases: throughput units
agents: linux
-catalog: app/databases
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_databases.storage b/checkman/azure_databases.storage
index 5188262..ec3f7a7 100644
--- a/checkman/azure_databases.storage
+++ b/checkman/azure_databases.storage
@@ -1,6 +1,6 @@
-title: Azure Monitoring: Database storage
+title: Microsoft Azure SQL Databases: storage
agents: linux
-catalog: app/databases
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_sites b/checkman/azure_sites
index e58bedc..fe9b4ff 100644
--- a/checkman/azure_sites
+++ b/checkman/azure_sites
@@ -1,6 +1,6 @@
-title: Azure Monitoring: Webserver
+title: Microsoft Azure Webserver
agents: linux
-catalog: app/webserver
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_virtualmachines b/checkman/azure_virtualmachines
index 7e2c4d1..539e3d3 100644
--- a/checkman/azure_virtualmachines
+++ b/checkman/azure_virtualmachines
@@ -1,6 +1,6 @@
-title: Virtual Machine under Azure
+title: Microsoft Azure Virtual Machines
agents: azure
-catalog: os/misc
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/checkman/azure_virtualmachines.summary
b/checkman/azure_virtualmachines.summary
index 712065f..5521d39 100644
--- a/checkman/azure_virtualmachines.summary
+++ b/checkman/azure_virtualmachines.summary
@@ -1,6 +1,6 @@
-title: Summary Virtual Machine under Azure
+title: Microsoft Azure Virtual Machines: Summary
agents: azure
-catalog: os/misc
+catalog: cloud/azure
license: GPL
distribution: check_mk
description:
diff --git a/cmk/gui/wato/pages/check_catalog.py b/cmk/gui/wato/pages/check_catalog.py
index b20e337..6018413 100644
--- a/cmk/gui/wato/pages/check_catalog.py
+++ b/cmk/gui/wato/pages/check_catalog.py
@@ -317,6 +317,8 @@ class ModeCheckPlugins(WatoMode):
("app", False, _("Applications"),
_("Monitoring of applications such as "
"processes, services or databases")),
+ ("cloud", False, _("Cloud Based Environments"),
+ _("Monitoring of cloud environments like Microsoft Azure")),
("agentless", False, _("Networking checks without
agent"),
_("Plugins that directly check networking "
"protocols like HTTP or IMAP")),
diff --git a/cmk/man_pages.py b/cmk/man_pages.py
index 408f278..7b24c8f 100644
--- a/cmk/man_pages.py
+++ b/cmk/man_pages.py
@@ -203,8 +203,10 @@ catalog_titles = {
"networking" : "Networking",
"misc" : "Miscellaneous",
"storage" : "Filesystems, Disks and RAID",
-
- "agentless" : "Networking checks without agent",
+ "cloud" : "Cloud Based Environments",
+ "azure" : "Microsoft Azure",
+ "aws" : "Amazon Web Services",
+ "agentless": "Networking checks without agent",
"generic" : "Generic check plugins",
"unsorted" : "Uncategorized",
} # yapf: disable
diff --git a/web/htdocs/images/icon_plugins_cloud.png
b/web/htdocs/images/icon_plugins_cloud.png
new file mode 100644
index 0000000..5bac406
Binary files /dev/null and b/web/htdocs/images/icon_plugins_cloud.png differ
diff --git a/web/htdocs/themes/facelift/images/icon_plugins_cloud.png
b/web/htdocs/themes/facelift/images/icon_plugins_cloud.png
new file mode 100644
index 0000000..1997d90
Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_plugins_cloud.png
differ