add duplicate supression for services

move https-cert dependency outside the loop where it belongs
don't generate service dependencies for virtual hosts

diff --git a/gen/nagios-wsh.gen b/gen/nagios-wsh.gen
index ab61299e114a8d2311c71add1409a617f0107dba..c33e559b235c95375f0e4b0329892608285f5e4e 100755 (executable)
--- a/gen/nagios-wsh.gen
+++ b/gen/nagios-wsh.gen
@@ -85,6 +85,7 @@ END
                $ucservice =~ tr/a-z/A-Z/;
                my $lcservice = $service;
                $lcservice =~ tr/A-Z/a-z/;
+               next if $services{$ucservice};
                $services{$ucservice}++;
                print OUT <<END;
 define service{
@@ -104,6 +105,7 @@ define serviceescalation{
 
 END
            } elsif ($service =~ /^HTTPS-CERT$/i) {
+               next if $services{'HTTPS-CERT'};
                $services{'HTTPS-CERT'}++;
                print OUT <<END;
 define service{
@@ -131,11 +133,13 @@ END
                    }
                    # prep a bunch of variables for the text we'll spit out
                    my $description = "$protocol-$server-$path";
+                   $description =~ tr/A-Z/a-z/;
+                   next if $services{$description};
+                   $services{$description}++;
                    $description =~ s/-\//-/g;
                    $description =~ s/\/-/-/g;
                    $description =~ s/\//-/g;
                    $description =~ s/-$//g;
-                   $description =~ tr/A-Z/a-z/;
                    my $ucdescription = $description;
                    $ucdescription =~ tr/a-z/A-Z/;
                    my $SSL = "";
@@ -167,7 +171,7 @@ define serviceescalation{
        }
 
 END
-                   if ($services{$protocol}) {
+                   if ($services{$protocol} && $name eq $server) {
                    print OUT <<END;
 define servicedependency{
        dependent_host_name             $name
@@ -184,9 +188,9 @@ END
                    printf STDERR "Machine %s has unknown service %s; ignoring\n", $name, $service;
                }
            }  # if SERVICE else URL
-
-           if ($services{'HTTPS'} && $services{'HTTPS-CERT'}) {
-               print OUT <<END;
+       } # while @tags
+       if ($services{'HTTPS'} && $services{'HTTPS-CERT'}) {
+           print OUT <<END;
 define servicedependency{
        dependent_host_name             $name
        dependent_service_description   HTTPS-CERT
@@ -197,7 +201,6 @@ define servicedependency{
        }
 
 END
-           }
        }
     } # while $sth->fetchrow_array