Add spike-07 to www and remove spike-08

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index a732711af2b36173d1820e4c3f50db35a8108675..1b9f87f0fb08a9aa7c52d2fa97320332b2037cf9 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -6,7 +6,7 @@ use warnings;
 use IO::File;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;
 use IO::File;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;

-use LWP::UserAgent::Determined;
+use LWP::UserAgent;

 use YAML;
 
 my $originfile = shift @ARGV;
 use YAML;
 
 my $originfile = shift @ARGV;


@@ -36,7 +36,7 @@ while (my($name,$cluster) = each %$clusters)
     {
         my $server = {
             cluster => $cluster,
     {
         my $server = {
             cluster => $cluster,

-            pingdom => $cluster->{pingdom},
+            statuscake => $cluster->{statuscake},

             bandwidth => $cluster->{bandwidth},
             ipv4 => $cluster->{ipv4},
             ipv6 => $cluster->{ipv6}
             bandwidth => $cluster->{bandwidth},
             ipv4 => $cluster->{ipv4},
             ipv6 => $cluster->{ipv6}


@@ -48,61 +48,87 @@ while (my($name,$cluster) = each %$clusters)
     }
 
     $cluster->{name} = $name;
     }
 
     $cluster->{name} = $name;

-
-    if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
-    {
-        $cluster->{status} = "down";
-    }
-    else
-    {
-        $cluster->{status} = "up";
-    }
+    $cluster->{status} = "down";

 }
 
 # Initialise server details
 foreach my $server (@servers)
 {
 }
 
 # Initialise server details
 foreach my $server (@servers)
 {

-    if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
+    $server->{status} = "up";
+}
+
+# If statuscake support is enabled then check which servers are up
+if ($ENV{STATUSCAKE_USERNAME} && $ENV{STATUSCAKE_APIKEY})
+{
+    my $ua = LWP::UserAgent->new;
+    my $cache;
+
+    $ua->agent("mkgeo/1.0");
+    $ua->default_header("Username", $ENV{STATUSCAKE_USERNAME});
+    $ua->default_header("API", $ENV{STATUSCAKE_APIKEY});
+
+    if (-f "statuscake.yml")

     {
     {

-        $server->{status} = "down";
+        $cache = YAML::LoadFile("statuscake.yml");

     }
     else
     {
     }
     else
     {

-        $server->{status} = "up";
+        $cache = {};

     }
     }

-}

 
 

-# If pingdom support is enabled then check which servers are up
-if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
-{
-    my $ua = LWP::UserAgent::Determined->new;
-    $ua->timeout(15);
+    my $response = $ua->get("https://app.statuscake.com/API/Tests/");

 
 

-    $ua->default_header("App-Key", "2cohi62u5haxvqmypk3ljqqrze1jufrh");
-    $ua->credentials("api.pingdom.com:443", "Pingdom API", $ENV{PINGDOM_USERNAME}, $ENV{PINGDOM_PASSWORD});
+    if ($response->is_success)
+    {
+        my $tests = decode_json($response->content);
+
+        foreach my $test (@$tests)
+        {
+            my $testid = $test->{TestID};
+
+            if ($test->{Status} eq "Up" && !$test->{Paused})
+            {
+                $cache->{$testid} = "up";
+            }
+            else
+            {
+                $cache->{$testid} = "down";
+            }
+        }
+    }

 
     foreach my $server (@servers)
     {
 
     foreach my $server (@servers)
     {

-        if (my $checkid = $server->{pingdom})
+        if (my $testids = $server->{statuscake})

         {
         {

-            my $response = $ua->get("https://api.pingdom.com/api/2.0/checks/${checkid}");
+            $server->{status} = "up";

 
 

-            if ($response->is_success)
+            for my $testid (@$testids)

             {
             {

-                my $check = decode_json($response->content);
-
-                $server->{status} = $check->{check}->{status};
-
-                if ($server->{status} eq "up")
-                {
-                    $server->{cluster}->{status} = "up";
-                }
-                else
-                {
-                    $server->{cluster}->{bandwidth} = $server->{cluster}->{bandwidth} - $server->{bandwidth};
-                }
+                my $testresult = $cache->{$testid} || "down";
+
+                $server->{status} = "down" if $testresult eq "down";

             }
         }
             }
         }

+        else
+        {
+            $server->{status} = "down";
+        }
+    }
+
+    YAML::DumpFile("statuscake.yml", $cache);
+}
+
+# Mark a cluster as up if any servers are up
+foreach my $server (@servers)
+{
+    if ($server->{status} eq "up")
+    {
+        $server->{cluster}->{status} = "up";
+    }
+    else
+    {
+        $server->{cluster}->{bandwidth} = $server->{cluster}->{bandwidth} - $server->{bandwidth};

     }
 }
 
     }
 }
 


@@ -179,7 +205,7 @@ my $zonefile = IO::File->new("> data/${zone}") || die "$!";
 my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 
 # Output details for each country
 my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 
 # Output details for each country

-foreach my $origin (values %$origins)
+foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)

 {
     my $cluster = $origin->{cluster};
     my $clon = $origin->{lon};
 {
     my $cluster = $origin->{cluster};
     my $clon = $origin->{lon};


@@ -219,8 +245,10 @@ foreach my $origin (values %$origins)
 $zonefile->print("# Unknown origins\n");
 
 # Output default records for IPs that can't be mapped to a country
 $zonefile->print("# Unknown origins\n");
 
 # Output default records for IPs that can't be mapped to a country

-while (my($name,$cluster) = each %$clusters)
+foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)

 {
 {

+    my $name = $cluster->{name};
+

     if (my $default = $cluster->{default})
     {
         output_server($zonefile, "${default}.${zone}", $cluster);
     if (my $default = $cluster->{default})
     {
         output_server($zonefile, "${default}.${zone}", $cluster);


@@ -235,8 +263,10 @@ while (my($name,$cluster) = each %$clusters)
 $zonefile->print("# Servers\n");
 
 # Output A records for each cluster
 $zonefile->print("# Servers\n");
 
 # Output A records for each cluster

-while (my($name,$cluster) = each %$clusters)
+foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)

 {
 {

+    my $name = $cluster->{name};
+

     output_server($zonefile, "${name}.${zone}", $cluster);
 }
 
     output_server($zonefile, "${name}.${zone}", $cluster);
 }
 


@@ -262,14 +292,20 @@ sub match_origin
     my $match;
 
     if ($cluster->{preferred} &&
     my $match;
 
     if ($cluster->{preferred} &&

-        $cluster->{preferred}->{countries} &&
-        grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}})
+        $cluster->{preferred}->{origins} &&
+        grep { $_ eq $origin->{name} } @{$cluster->{preferred}->{origins}})

     {
         $match = "preferred";
     }
     {
         $match = "preferred";
     }

+    elsif ($cluster->{allowed} &&
+           $cluster->{allowed}->{origins} &&
+           grep { $_ eq $origin->{name} } @{$cluster->{allowed}->{origins}})
+    {
+        $match = "allowed";
+    }

     elsif ($cluster->{preferred} &&
     elsif ($cluster->{preferred} &&

-           $cluster->{preferred}->{continents} &&
-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+           $cluster->{preferred}->{countries} &&
+           grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}})

     {
         $match = "preferred";
     }
     {
         $match = "preferred";
     }


@@ -279,21 +315,27 @@ sub match_origin
     {
         $match = "allowed";
     }
     {
         $match = "allowed";
     }

+    elsif ($cluster->{denied} &&
+           $cluster->{denied}->{countries} &&
+           grep { $_ eq $origin->{country} } @{$cluster->{denied}->{countries}})
+    {
+        $match = "denied";
+    }
+    elsif ($cluster->{preferred} &&
+           $cluster->{preferred}->{continents} &&
+           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+    {
+        $match = "preferred";
+    }

     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{continents} &&
            grep { $_ eq $origin->{continent} } @{$cluster->{allowed}->{continents}})
     {
         $match = "allowed";
     }
     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{continents} &&
            grep { $_ eq $origin->{continent} } @{$cluster->{allowed}->{continents}})
     {
         $match = "allowed";
     }

-    elsif ($cluster->{denied} &&
-           $cluster->{denied}->{countries} &&
-           grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}})
-    {
-        $match = "denied";
-    }

     elsif ($cluster->{denied} &&
            $cluster->{denied}->{continents} &&
     elsif ($cluster->{denied} &&
            $cluster->{denied}->{continents} &&

-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+           grep { $_ eq $origin->{continent} } @{$cluster->{denied}->{continents}})

     {
         $match = "denied";
     }
     {
         $match = "denied";
     }


@@ -395,11 +437,11 @@ sub output_server
     {
         if ($server->{status} eq "up")
         {
     {
         if ($server->{status} eq "up")
         {

-            $zonefile->print("+${name}:$server->{ipv4}:3600\n");
+            $zonefile->print("+${name}:$server->{ipv4}:600\n");

 
             if ($server->{ipv6})
             {
 
             if ($server->{ipv6})
             {

-#                $zonefile->print("3${name}:$server->{ipv6}:3600\n");
+#                $zonefile->print("3${name}:$server->{ipv6}:600\n");

             }
         }
     }
             }
         }
     }