X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/b9a33b134683c97f6fa06fa13eeefed997000d3f..f6f45923958e3c578038ac0b2a4913b45f17d2bc:/bin/mkgeo?ds=sidebyside

diff --git a/bin/mkgeo b/bin/mkgeo
index 8dbe80a..bd5bfbb 100755
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -36,7 +36,7 @@ while (my($name,$cluster) = each %$clusters)
     {
         my $server = {
             cluster => $cluster,
-            pingdom => $cluster->{pingdom},
+            statuscake => $cluster->{statuscake},
             bandwidth => $cluster->{bandwidth},
             ipv4 => $cluster->{ipv4},
             ipv6 => $cluster->{ipv6}
@@ -48,68 +48,106 @@ while (my($name,$cluster) = each %$clusters)
     }
 
     $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)
 {
-    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
     {
-        $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->new;
+    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)
     {
-        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};
+    }
+}
+
+# Create target origins object
+my $targetorigins = {};
+
 # Initialise cluster details
 while (my($name,$cluster) = each %$clusters)
 {
     $cluster->{bandwidth_limit} = $cluster->{bandwidth} * 1024 * 1024;
     $cluster->{bandwidth_used} = 0;
+
+    $targetorigins->{$cluster->{name}} = {
+        code => $cluster->{name},
+        name => $cluster->{name},
+        lat => $cluster->{lat},
+        lon => $cluster->{lon},
+        bandwidth => 0
+    };
 }
 
 my @mappings = ();
@@ -162,15 +200,12 @@ while (grep { !exists($_->{cluster}) } values %$origins)
 # Create JSON collection object
 my @json;
 
-# Create target origins object
-my $targetorigins = {};
-
 # Open output files
 my $zonefile = IO::File->new("> data/${zone}") || die "$!";
 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};
@@ -203,17 +238,6 @@ foreach my $origin (values %$origins)
         }
     };
 
-    unless (exists($targetorigins->{$cluster->{name}}))
-    {
-        $targetorigins->{$cluster->{name}} = {
-            code => $cluster->{name},
-            name => $cluster->{name},
-            lat => $cluster->{lat},
-            lon => $cluster->{lon},
-            bandwidth => 0
-        };
-    }
-
     $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
 }
 
@@ -221,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
-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);
@@ -237,8 +263,10 @@ while (my($name,$cluster) = each %$clusters)
 $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);
 }
 
@@ -269,33 +297,33 @@ sub match_origin
     {
         $match = "preferred";
     }
-    elsif ($cluster->{preferred} &&
-           $cluster->{preferred}->{continents} &&
-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
-    {
-        $match = "preferred";
-    }
     elsif ($cluster->{allowed} &&
            $cluster->{allowed}->{countries} &&
            grep { $_ eq $origin->{country} } @{$cluster->{allowed}->{countries}})
     {
         $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->{denied} &&
-           $cluster->{denied}->{countries} &&
-           grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}})
-    {
-        $match = "denied";
-    }
     elsif ($cluster->{denied} &&
            $cluster->{denied}->{continents} &&
-           grep { $_ eq $origin->{continent} } @{$cluster->{preferred}->{continents}})
+           grep { $_ eq $origin->{continent} } @{$cluster->{denied}->{continents}})
     {
         $match = "denied";
     }
@@ -397,11 +425,11 @@ sub output_server
     {
         if ($server->{status} eq "up")
         {
-            $zonefile->print("+${name}:$server->{ipv4}:3600\n");
+            $zonefile->print("+${name}:$server->{ipv4}:600\n");
 
             if ($server->{ipv6})
             {
-#                $zonefile->print("3${name}:$server->{ipv6}:3600\n");
+#                $zonefile->print("3${name}:$server->{ipv6}:600\n");
             }
         }
     }