Module: check_mk
Branch: master
Commit: d5db1b885eee14d4f643b4399aa525d8ae29ad20
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5db1b885eee14…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Mon Jan 21 12:57:27 2019 +0100
azure: some minor fixes
* checkman: correct agent is 'azure'
* agent: missing formatter
* args: return options as list
Change-Id: Id684fa75daaa4c3f1d0c8eb3c19853cbdb7c0eb9
---
agents/special/agent_azure | 2 +-
checkman/azure_agent_info | 2 +-
checkman/azure_databases | 2 +-
checkman/azure_databases.connections | 2 +-
checkman/azure_databases.cpu | 2 +-
checkman/azure_databases.deadlock | 2 +-
checkman/azure_databases.dtu | 2 +-
checkman/azure_databases.storage | 2 +-
checkman/azure_sites | 2 +-
checkman/azure_storageaccounts | 2 +-
checkman/azure_storageaccounts.flow | 2 +-
checkman/azure_storageaccounts.performance | 2 +-
checkman/azure_virtualnetworkgateways | 2 +-
checks/agent_azure_args | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/agents/special/agent_azure b/agents/special/agent_azure
index a32e175..c6ba6d3 100755
--- a/agents/special/agent_azure
+++ b/agents/special/agent_azure
@@ -407,7 +407,7 @@ class AzureMetric(object): # pylint:
disable=too-many-instance-attributes
self.timestamp = calendar.timegm(data.time_stamp.utctimetuple())
return
- raise AzureMetricParseError('warning', "not found: %s %s",
self.name, aggregation)
+ raise AzureMetricParseError('warning', "not found: %s (%s)" %
(self.name, aggregation))
@property
def tuple(self):
diff --git a/checkman/azure_agent_info b/checkman/azure_agent_info
index 26178df..16c59ef 100644
--- a/checkman/azure_agent_info
+++ b/checkman/azure_agent_info
@@ -1,5 +1,5 @@
title: Microsoft Azure Agent Info
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_databases b/checkman/azure_databases
index dcc9a78..f81c6ca 100644
--- a/checkman/azure_databases
+++ b/checkman/azure_databases
@@ -1,5 +1,5 @@
title: Microsoft Azure SQL Databases
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_databases.connections b/checkman/azure_databases.connections
index 1d939b9..99b3db2 100644
--- a/checkman/azure_databases.connections
+++ b/checkman/azure_databases.connections
@@ -1,5 +1,5 @@
title: Microsoft Azure SQL Databases: Connections
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_databases.cpu b/checkman/azure_databases.cpu
index b85d31a..249c81d 100644
--- a/checkman/azure_databases.cpu
+++ b/checkman/azure_databases.cpu
@@ -1,5 +1,5 @@
title: Microsoft Azure SQL Databases: CPU utilization
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_databases.deadlock b/checkman/azure_databases.deadlock
index ab99ed8..4d2da01 100644
--- a/checkman/azure_databases.deadlock
+++ b/checkman/azure_databases.deadlock
@@ -1,5 +1,5 @@
title: Microsoft Azure SQL Databases: Deadlocks
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_databases.dtu b/checkman/azure_databases.dtu
index 08c38f6..5542b80 100644
--- a/checkman/azure_databases.dtu
+++ b/checkman/azure_databases.dtu
@@ -1,5 +1,5 @@
title: Microsoft Azure SQL Databases: Throughput units
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_databases.storage b/checkman/azure_databases.storage
index 46bf5a0..4e53f8e 100644
--- a/checkman/azure_databases.storage
+++ b/checkman/azure_databases.storage
@@ -1,5 +1,5 @@
title: Microsoft Azure SQL Databases: Storage
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_sites b/checkman/azure_sites
index fe9b4ff..28df326 100644
--- a/checkman/azure_sites
+++ b/checkman/azure_sites
@@ -1,5 +1,5 @@
title: Microsoft Azure Webserver
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_storageaccounts b/checkman/azure_storageaccounts
index 1fc3f83..d3dad55 100644
--- a/checkman/azure_storageaccounts
+++ b/checkman/azure_storageaccounts
@@ -1,5 +1,5 @@
title: Microsoft Azure Storage Accounts
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_storageaccounts.flow b/checkman/azure_storageaccounts.flow
index efadbcd..c38c336 100644
--- a/checkman/azure_storageaccounts.flow
+++ b/checkman/azure_storageaccounts.flow
@@ -1,5 +1,5 @@
title: Microsoft Azure Storage Accounts: Data flow
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_storageaccounts.performance
b/checkman/azure_storageaccounts.performance
index 63b6aa6..0fa8363 100644
--- a/checkman/azure_storageaccounts.performance
+++ b/checkman/azure_storageaccounts.performance
@@ -1,5 +1,5 @@
title: Microsoft Azure Storage Accounts: Performance
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checkman/azure_virtualnetworkgateways
b/checkman/azure_virtualnetworkgateways
index 79066fc..98e2b13 100644
--- a/checkman/azure_virtualnetworkgateways
+++ b/checkman/azure_virtualnetworkgateways
@@ -1,5 +1,5 @@
title: Microsoft Azure Virtual Network Gateways
-agents: linux
+agents: azure
catalog: cloud/azure
license: GPL
distribution: check_mk
diff --git a/checks/agent_azure_args b/checks/agent_azure_args
index 7be5779..a67b86d 100644
--- a/checks/agent_azure_args
+++ b/checks/agent_azure_args
@@ -40,7 +40,7 @@ def agent_azure_arguments(params, _no_hostname, _no_ipaddress):
config = params['config']
if "fetchall" in config:
- return ' '.join(args)
+ return args
explicit = config.get('explicit-config', [])
if explicit: