From 31cc591c2d771f2392eef4cfe354c34f2ccc20f3 Mon Sep 17 00:00:00 2001 From: Will Yardley Date: Mon, 20 Mar 2017 15:19:07 -0700 Subject: [PATCH 08/10] Add '.' to character class for hostnames (to accommodate FQDNs) (#80) --- scripts/check_rabbitmq_partition | 2 +- scripts/check_rabbitmq_server | 2 +- scripts/check_rabbitmq_watermark | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/check_rabbitmq_partition b/scripts/check_rabbitmq_partition index 7c9d3a5..0b4336f 100755 --- a/scripts/check_rabbitmq_partition +++ b/scripts/check_rabbitmq_partition @@ -101,7 +101,7 @@ my $nodename = $p->opts->node; my $rname = $p->opts->rname; if (!$nodename) { - $hostname =~ /^([a-zA-Z0-9-]*)/; + $hostname =~ /^([a-zA-Z0-9-.]+)/; $nodename = $1; } diff --git a/scripts/check_rabbitmq_server b/scripts/check_rabbitmq_server index 4e47585..b97803c 100755 --- a/scripts/check_rabbitmq_server +++ b/scripts/check_rabbitmq_server @@ -124,7 +124,7 @@ my $nodename = $p->opts->node; my $rname = $p->opts->rname; if (!$nodename) { - $hostname =~ /^([a-zA-Z0-9-]*)/; + $hostname =~ /^([a-zA-Z0-9-.]*)/; $nodename = $1; } diff --git a/scripts/check_rabbitmq_watermark b/scripts/check_rabbitmq_watermark index c944dca..0fe4e0b 100755 --- a/scripts/check_rabbitmq_watermark +++ b/scripts/check_rabbitmq_watermark @@ -107,7 +107,7 @@ my $nodename = $p->opts->node; my $rname = $p->opts->rname; if (!$nodename) { - $hostname =~ /^([a-zA-Z0-9-]*)/; + $hostname =~ /^([a-zA-Z0-9-.]*)/; $nodename = $1; } -- 2.20.1