Module: check_mk
Branch: master
Commit: 55fe7158429fced04c774008ba7a1f5aaa6f406d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fe7158429fce…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Fri Jan 25 07:28:28 2019 +0100
azure: remove '-' from params keys for consistency
Change-Id: I32417cdda71a0fb4e6fa0fdcb658c88034bafb99
---
agents/special/agent_azure | 16 ++++++++--------
checks/agent_azure | 16 +++++++++-------
cmk/gui/plugins/wato/datasource_programs.py | 23 +++++++++++------------
3 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/agents/special/agent_azure b/agents/special/agent_azure
index c6ba6d3..9c3106d 100755
--- a/agents/special/agent_azure
+++ b/agents/special/agent_azure
@@ -166,16 +166,16 @@ def parse_arguments(argv):
type=int,
help='''Timeout for individual processes in seconds (default
10)''')
parser.add_argument(
- "--piggyback-vms",
+ "--piggyback_vms",
default="",
choices=["agenthost", "self", "all"],
help='''Additionally create VM piggyback data for the host running
the agent,
the VM iteself, or both''')
# REQUIRED
- parser.add_argument("--subscription-id", required=True, help="Azure
subscription ID")
- parser.add_argument("--client-id", required=True, help="Azure client
ID")
- parser.add_argument("--tenant-id", required=True, help="Azure tenant
ID")
+ parser.add_argument("--subscription", required=True, help="Azure
subscription ID")
+ parser.add_argument("--client", required=True, help="Azure client
ID")
+ parser.add_argument("--tenant", required=True, help="Azure tenant
ID")
parser.add_argument("--secret", required=True, help="Azure
authentication secret")
# CONSTRAIN DATA TO REQUEST
parser.add_argument(
@@ -468,11 +468,11 @@ class AzureClient(object): # pylint:
disable=too-many-instance-attributes
self.remaining_reads = "unknown (no metrics fetched)"
self._creds = ServicePrincipalCredentials(
- client_id=args.client_id, secret=args.secret, tenant=args.tenant_id)
+ client_id=args.client, secret=args.secret, tenant=args.tenant)
# azure-api-call
- self._monitor_client = MonitorManagementClient(self._creds,
self.args.subscription_id)
+ self._monitor_client = MonitorManagementClient(self._creds,
self.args.subscription)
# azure-api-call
- self._resource_client = ResourceManagementClient(self._creds,
self.args.subscription_id)
+ self._resource_client = ResourceManagementClient(self._creds,
self.args.subscription)
self.specific_clients = {}
@@ -501,7 +501,7 @@ class AzureClient(object): # pylint:
disable=too-many-instance-attributes
for rtp in r_types:
client_class = AzureClient.SPECIFIC_CLIENTS.get(rtp)
if client_class is not None:
- self.specific_clients[rtp] = client_class(self._creds,
self.args.subscription_id)
+ self.specific_clients[rtp] = client_class(self._creds,
self.args.subscription)
def process_specific(self, resource):
client = self.specific_clients.get(resource.info["type"])
diff --git a/checks/agent_azure b/checks/agent_azure
index a67b86d..4aac3ae 100644
--- a/checks/agent_azure
+++ b/checks/agent_azure
@@ -24,25 +24,27 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-_FETCHALL = '*'
-
def agent_azure_arguments(params, _no_hostname, _no_ipaddress):
args = []
- opts = (i for i in params.iteritems() if i[0].startswith("--"))
- for key, value in opts:
+ keys = ("subscription", "tenant", "client",
"secret", "piggyback_vms", "sequential")
+ present_keys = (k for k in keys if k in params.keys())
+
+ for key in present_keys:
+ option = "--%s" % key
+ value = params[key]
if isinstance(value, bool):
if value:
- args.append(key)
+ args.append(option)
else:
- args += [key, quote_shell_string(value)]
+ args += [option, quote_shell_string(value)]
config = params['config']
if "fetchall" in config:
return args
- explicit = config.get('explicit-config', [])
+ explicit = config.get('explicit', [])
if explicit:
args.append("--explicit-config")
for group_dict in explicit:
diff --git a/cmk/gui/plugins/wato/datasource_programs.py
b/cmk/gui/plugins/wato/datasource_programs.py
index d318861..be065d9 100644
--- a/cmk/gui/plugins/wato/datasource_programs.py
+++ b/cmk/gui/plugins/wato/datasource_programs.py
@@ -1564,25 +1564,24 @@ class RulespecSpecialAgentsAzure(HostRulespec):
"service of the host owning the datasource program."),
# element names starting with "--" will be passed do cmd line w/o
parsing!
elements=[
- ("--subscription-id",
- TextAscii(
- title=_("Subscription ID"),
- allow_empty=False,
- size=45,
- )),
- ("--tenant-id",
+ ("subscription", TextAscii(
+ title=_("Subscription ID"),
+ allow_empty=False,
+ size=45,
+ )),
+ ("tenant",
TextAscii(
title=_("Tenant ID / Directory ID"),
allow_empty=False,
size=45,
)),
- ("--client-id",
+ ("client",
TextAscii(
title=_("Client ID / Application ID"),
allow_empty=False,
size=45,
)),
- ("--secret", Password(
+ ("secret", Password(
title=_("Secret"),
allow_empty=False,
size=45,
@@ -1616,7 +1615,7 @@ class RulespecSpecialAgentsAzure(HostRulespec):
)),
],
)),
- ("--piggyback-vms",
+ ("piggyback_vms",
DropdownChoice(
title=_("Create piggyback VM data"),
help=_("You can choose to <i>additionally</i> send
data concerning VMs to"
@@ -1629,14 +1628,14 @@ class RulespecSpecialAgentsAzure(HostRulespec):
("all", _("Send data to both the agent host and
the VM itself")),
],
)),
- ("--sequential",
+ ("sequential",
Checkbox(
title=_("Run in single thread"),
help=_("Check this to avoid multiprocessing. "
"Recommended for debugging purposes only."),
)),
],
- optional_keys=["--piggyback-vms"],
+ optional_keys=["piggyback_vms"],
)
def _azure_group_config(self):