Revert "Drop stormfly-04 from nominatim"

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 7b70c2240020ebdd007ed2f08547225702b66fa6..3a69d89af6639e476e78c61cc910a8dbd73656a8 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+use v5.12;
+

 use strict;
 use warnings;
 
 use strict;
 use warnings;
 


@@ -7,14 +9,15 @@ use IO::File;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;
 use LWP::UserAgent;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;
 use LWP::UserAgent;

-use YAML;
+use YAML::XS qw(LoadFile DumpFile);

 
 my $originfile = shift @ARGV;
 my $clusterfile = shift @ARGV;
 my $zone = shift @ARGV;
 my $targetoriginfile = shift @ARGV;
 
 my $originfile = shift @ARGV;
 my $clusterfile = shift @ARGV;
 my $zone = shift @ARGV;
 my $targetoriginfile = shift @ARGV;

-my $origins = YAML::LoadFile($originfile);
-my $clusters = YAML::LoadFile($clusterfile);
+my $origins = LoadFile($originfile);
+my $clusters = LoadFile($clusterfile);
+my $gdnsname = shift @ARGV;

 my @servers;
 
 # Initialise cluster details
 my @servers;
 
 # Initialise cluster details


@@ -22,22 +25,23 @@ while (my($name,$cluster) = each %$clusters)
 {
     if ($cluster->{servers})
     {
 {
     if ($cluster->{servers})
     {

-        $cluster->{bandwidth} = 0;
+        $cluster->{requests} = 0;

 
         foreach my $server (@{$cluster->{servers}})
         {
             $server->{cluster} = $cluster;
 
         foreach my $server (@{$cluster->{servers}})
         {
             $server->{cluster} = $cluster;

-            $cluster->{bandwidth} = $cluster->{bandwidth} + $server->{bandwidth};
+            $cluster->{requests} = $cluster->{requests} + $server->{requests};

 
             push @servers, $server;
         }
     }
 
             push @servers, $server;
         }
     }

-    else
+    elsif ($cluster->{requests} > 0)

     {
         my $server = {
             cluster => $cluster,
     {
         my $server = {
             cluster => $cluster,

-            pingdom => $cluster->{pingdom},
-            bandwidth => $cluster->{bandwidth},
+            statuscake => $cluster->{statuscake},
+            requests => $cluster->{requests},
+            cname => $cluster->{cname},

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


@@ -46,6 +50,10 @@ while (my($name,$cluster) = each %$clusters)
 
         push @servers, $server;
     }
 
         push @servers, $server;
     }

+    else
+    {
+        $cluster->{servers} = [];
+    }

 
     $cluster->{name} = $name;
     $cluster->{status} = "down";
 
     $cluster->{name} = $name;
     $cluster->{status} = "down";


@@ -57,46 +65,75 @@ foreach my $server (@servers)
     $server->{status} = "up";
 }
 
     $server->{status} = "up";
 }
 

-# If pingdom support is enabled then check which servers are up
-if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
+# If statuscake support is enabled then check which servers are up
+if ($ENV{STATUSCAKE_APIKEY})

 {
     my $ua = LWP::UserAgent->new;
     my $cache;
 
 {
     my $ua = LWP::UserAgent->new;
     my $cache;
 

-    $ua->timeout(5);
-    $ua->default_header("App-Key", "2cohi62u5haxvqmypk3ljqqrze1jufrh");
-    $ua->credentials("api.pingdom.com:443", "Pingdom API", $ENV{PINGDOM_USERNAME}, $ENV{PINGDOM_PASSWORD});
+    $ua->agent("mkgeo/1.0");
+    $ua->default_header("Authorization", "Bearer $ENV{STATUSCAKE_APIKEY}");

 
 

-    if (-f "pingdom.yml")
+    if (-f "statuscake.yml")

     {
     {

-        $cache = YAML::LoadFile("pingdom.yml"); 
+        $cache = LoadFile("statuscake.yml");

     }
     else
     {
         $cache = {};
     }
 
     }
     else
     {
         $cache = {};
     }
 

-    foreach my $server (@servers)
+    my $page = 1;
+    my $pages = 1;
+
+    while ($page <= $pages)

     {
     {

-        if (my $checkid = $server->{pingdom})
+        my $response = $ua->get("https://api.statuscake.com/v1/uptime?nouptime=true&limit=100&page=${page}");
+
+        if ($response->is_success)

         {
         {

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

 
 

-            if ($response->is_success)
+            foreach my $test (@{$uptime->{data}})

             {
             {

-                my $check = decode_json($response->content);
-
-                $server->{status} = $check->{check}->{status};
-                $cache->{$server->{pingdom}} = $check->{check}->{status};
+                my $testid = $test->{id};
+
+                if ($test->{status} eq "up" && !$test->{paused})
+                {
+                    $cache->{$testid} = "up";
+                }
+                else
+                {
+                    $cache->{$testid} = "down";
+                }

             }
             }

-            else
+
+            $page = $page + 1;
+            $pages = $uptime->{metadata}->{page_count};
+        }
+    }
+
+    foreach my $server (@servers)
+    {
+        if (my $testids = $server->{statuscake})
+        {
+            $server->{status} = "up";
+
+            for my $testid (@$testids)

             {
             {

-                $server->{status} = $cache->{$server->{pingdom}} || "down";
+                my $testresult = $cache->{$testid} || "down";
+
+                $server->{status} = "down" if $testresult eq "down";

             }
         }
             }
         }

+        else
+        {
+            $server->{status} = "down";
+        }

     }
 
     }
 

-    YAML::DumpFile("pingdom.yml", $cache);
+    DumpFile("statuscake-$$.yml", $cache);
+    rename("statuscake-$$.yml", "statuscake.yml");

 }
 
 # Mark a cluster as up if any servers are up
 }
 
 # Mark a cluster as up if any servers are up


@@ -108,25 +145,30 @@ foreach my $server (@servers)
     }
     else
     {
     }
     else
     {

-        $server->{cluster}->{bandwidth} = $server->{cluster}->{bandwidth} - $server->{bandwidth};
+        $server->{cluster}->{requests} = $server->{cluster}->{requests} - $server->{requests};

     }
 }
 
     }
 }
 

+# Abort if no servers at all are up
+exit 0 unless grep { $_->{status} eq "up" } values(%$clusters);
+

 # Create target origins object
 my $targetorigins = {};
 
 # Initialise cluster details
 while (my($name,$cluster) = each %$clusters)
 {
 # 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;
+    $cluster->{requests_limit} = $cluster->{requests};
+    $cluster->{requests_used} = 0;
+
+    next if $cluster->{global};

 
     $targetorigins->{$cluster->{name}} = {
         code => $cluster->{name},
         name => $cluster->{name},
         lat => $cluster->{lat},
         lon => $cluster->{lon},
 
     $targetorigins->{$cluster->{name}} = {
         code => $cluster->{name},
         name => $cluster->{name},
         lat => $cluster->{lat},
         lon => $cluster->{lon},

-        bandwidth => 0
+        requests => 0

     };
 }
 
     };
 }
 


@@ -142,7 +184,16 @@ foreach my $origin (values %$origins)
         if ($cluster->{status} eq "up" && $match ne "denied")
         {
             my $priority = $match eq "preferred" ? 20 : 10;
         if ($cluster->{status} eq "up" && $match ne "denied")
         {
             my $priority = $match eq "preferred" ? 20 : 10;

-            my $distance = distance($origin->{lat}, $origin->{lon}, $cluster->{lat}, $cluster->{lon});
+            my $distance;
+
+            if ($cluster->{global})
+            {
+                $distance = 0;
+            }
+            else
+            {
+                $distance = distance($origin->{lat}, $origin->{lon}, $cluster->{lat}, $cluster->{lon});
+            }

 
             push @mappings, {
                 origin => $origin, cluster => $cluster,
 
             push @mappings, {
                 origin => $origin, cluster => $cluster,


@@ -156,7 +207,7 @@ foreach my $origin (values %$origins)
 allocate_clusters(@mappings);
 
 # If we failed to allocate every origin then loop, increasing
 allocate_clusters(@mappings);
 
 # If we failed to allocate every origin then loop, increasing

-# the bandwidth for each cluster by a little and retrying until
+# the requests for each cluster by a little and retrying until

 # we manage to allocate everything
 while (grep { !exists($_->{cluster}) } values %$origins)
 {
 # we manage to allocate everything
 while (grep { !exists($_->{cluster}) } values %$origins)
 {


@@ -166,95 +217,227 @@ while (grep { !exists($_->{cluster}) } values %$origins)
         delete $origin->{cluster};
     }
 
         delete $origin->{cluster};
     }
 

-    # Reset bandwidth usage for clusters and increase limits by 10%
+    # Reset requests usage for clusters and increase limits by 10%

     foreach my $cluster (values %$clusters)
     {
     foreach my $cluster (values %$clusters)
     {

-        $cluster->{bandwidth_used} = 0;
-        $cluster->{bandwidth_limit} = $cluster->{bandwidth_limit} * 1.1;
+        $cluster->{requests_used} = 0;
+        $cluster->{requests_limit} = $cluster->{requests_limit} * 1.1;

     }
 
     # Try the allocate again
     allocate_clusters(@mappings);
 }
 
     }
 
     # Try the allocate again
     allocate_clusters(@mappings);
 }
 

+# Report on allocation results
+foreach my $name (sort keys %$clusters)
+{
+    my $cluster = $clusters->{$name};
+    my $used = int($cluster->{requests_used} + 0.5);
+    my $limit = $cluster->{requests_limit};
+
+    if ($limit > 0)
+    {
+        my $proportion = int($used / $limit * 100 + 0.5);
+    
+        print "${name}: used ${used} of ${limit} (${proportion}%)\n";
+    }
+    else
+    {
+        print "${name}: used ${used} of ${limit}\n";
+    }
+}
+

 # Create JSON collection object
 my @json;
 
 # Open output files
 # Create JSON collection object
 my @json;
 
 # Open output files

-my $zonefile = IO::File->new("> data/${zone}") || die "$!";
-my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
+my $zonefile = IO::File->new("> include/${zone}.js") || die "$!";
+my $jsonfile = IO::File->new("> json/${zone}.openstreetmap.org.json") || die "$!";
+
+# Output headers
+$zonefile->print("var \U${zone}\E_RECORDS = [\n");

 
 # Output details for each country
 
 # 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 $cluster = $origin->{cluster};

-    my $clon = $origin->{lon};
-    my $clat = $origin->{lat};
-    my $slon = $cluster->{lon};
-    my $slat = $cluster->{lat};

 
 

-    if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
+    if (!defined($gdnsname))

     {
     {

-        $slon = $slon + 360;
-    }
-    elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon)
-    {
-        $clon = $clon + 360;
+        $zonefile->print("  CNAME(\"\L$origin->{code}\E.${zone}\", \"$cluster->{name}.${zone}.openstreetmap.org.\", TTL(\"10m\")),\n");

     }
 
     }
 

-    $zonefile->print("# $origin->{name}\n");
-    $zonefile->print("C\L$origin->{code}\E.${zone}:$cluster->{name}.${zone}:600\n");
+    if ($cluster->{lon} && $cluster->{lat})
+    {
+        my $clon = $origin->{lon};
+        my $clat = $origin->{lat};
+        my $slon = $cluster->{lon};
+        my $slat = $cluster->{lat};

 
 

-    push @json, {
-        type => "Feature",
-        geometry => {
-            type => "LineString",
-            coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
-        },
-        properties => {
-            origin => $origin->{name},
-            server => $cluster->{name},
-            colour => $cluster->{colour}
+        if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
+        {
+            $slon = $slon + 360;
+        }
+        elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon)
+        {
+            $clon = $clon + 360;

         }
         }

-    };

 
 

-    $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
-}
+        push @json, {
+            type => "Feature",
+            geometry => {
+                type => "LineString",
+                coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
+            },
+            properties => {
+                origin => $origin->{name},
+                server => $cluster->{name},
+                colour => $cluster->{colour}
+            }
+        };
+    }

 
 

-# Header for default records
-$zonefile->print("# Unknown origins\n");
+    next if $cluster->{global};

 
 

-# Output default records for IPs that can't be mapped to a country
-while (my($name,$cluster) = each %$clusters)
+    $targetorigins->{$cluster->{name}}->{requests} += $origin->{requests};
+}
+
+# Skip default records if we don't need them
+if (!defined($gdnsname))

 {
 {

-    if (my $default = $cluster->{default})
+    # Output default records for IPs that can't be mapped to a country
+    foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)

     {
     {

-        output_server($zonefile, "${default}.${zone}", $cluster);
-    }
-    elsif (exists($cluster->{default}))
-    {
-        output_server($zonefile, "${zone}", $cluster);
+        my $name = $cluster->{name};
+
+        if (my $default = $cluster->{default})
+        {
+            output_server($zonefile, "${default}.${zone}", $cluster, 0);
+        }
+        elsif (exists($cluster->{default}))
+        {
+            output_server($zonefile, "${zone}", $cluster, 0);
+        }

     }
 }
 
     }
 }
 

-# Header for underlying servers
-$zonefile->print("# Servers\n");
-

 # Output A records for each cluster
 # Output A records for each cluster

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

 {
 {

-    output_server($zonefile, "${name}.${zone}", $cluster);
+    my $name = $cluster->{name};
+
+    if (@{$cluster->{servers}} > 1)
+    {
+        output_server($zonefile, "${name}-%02d.${zone}", $cluster, 1);
+    }
+    else
+    {
+        output_server($zonefile, "${name}.${zone}", $cluster, 1);
+    }

 }
 
 # Output the GeoJSON text
 $jsonfile->print(encode_json(\@json));
 
 }
 
 # Output the GeoJSON text
 $jsonfile->print(encode_json(\@json));
 

+# Output footers
+$zonefile->print("];\n");
+

 # Close the output files
 # Close the output files

-$jsonfile->close();

 $zonefile->close();
 $zonefile->close();

+$zonefile->close();
+
+# Output gdnsd configuration
+if (defined($gdnsname))
+{
+    my $gdnsmapfile = IO::File->new("> gdns/${gdnsname}.map") || die "$!";
+    my $gdnsresourcefile = IO::File->new("> gdns/${gdnsname}.resource") || die "$!";
+    my $gdnsweightedfile = IO::File->new("> gdns/${gdnsname}.weighted") || die "$!";
+    my $continent = "";
+
+    $gdnsmapfile->print("${gdnsname} => {\n");
+    $gdnsmapfile->print("  geoip2_db => /etc/gdnsd/geoip/GeoLite2-Country.mmdb\n");
+    $gdnsmapfile->print("  datacenters => [" . join(",", sort(keys(%$clusters))) . "]\n");
+    $gdnsmapfile->print("  map => {\n");
+    $gdnsmapfile->print("    default => [" . join(",", sort(map { $_->{name} } grep { $_->{default} } values(%$clusters))) . "]\n");
+
+    foreach my $origin (sort { $a->{continent} cmp $b->{continent} || $a->{code} cmp $b->{code} } values %$origins)
+    {
+        my $code = $origin->{code};
+        my $cluster = $origin->{cluster}->{name};
+
+        next if $code eq "XK";
+
+        if ($continent ne $origin->{continent})
+        {
+            $gdnsmapfile->print("    }\n") if $continent;
+
+            $continent = $origin->{continent};
+
+            $gdnsmapfile->print("    ${continent} => {\n");
+        }
+
+        $gdnsmapfile->print("      ${code} => [${cluster}]\n");
+    }
+
+    $gdnsmapfile->print("    }\n") if $continent;
+
+    $gdnsmapfile->print("  }\n");
+    $gdnsmapfile->print("}\n");
+
+    $gdnsresourcefile->print("${gdnsname} => {\n");
+    $gdnsresourcefile->print("  map => ${gdnsname}\n");
+    $gdnsresourcefile->print("  dcmap => {\n");
+
+    foreach my $cluster (sort { $a->{name} cmp $b->{name} } values %$clusters)
+    {
+        my $name = $cluster->{name};
+
+        if (@{$cluster->{servers}} > 1 && grep { $_->{status} eq "up" } @{$cluster->{servers}})
+        {
+            $gdnsweightedfile->print("${name} => {\n");
+
+            while (my($index,$server) = each @{$cluster->{servers}})
+            {
+                if ($server->{status} eq "up")
+                {
+                    my $number = sprintf("%02d", $index + 1);
+                    my $requests = $server->{requests};
+
+                    if (my $cname = $server->{cname})
+                    {
+                        $gdnsweightedfile->print("  ${name}-${number} = [ ${cname}., ${requests} ]\n");
+                    }
+                    else
+                    {
+                        $gdnsweightedfile->print("  ${name}-${number} = [ ${name}-${number}.${zone}.openstreetmap.org., ${requests} ]\n");
+                    }
+                }
+            }
+
+            $gdnsweightedfile->print("}\n");
+
+            $gdnsresourcefile->print("    ${name} => %weighted!${name}\n");
+        }
+        elsif (my $cname = $cluster->{cname})
+        {
+            $gdnsresourcefile->print("    ${name} => ${cname}.\n");
+        }
+        else
+        {
+            $gdnsresourcefile->print("    ${name} => ${name}.${zone}.openstreetmap.org.\n");
+        }
+    }
+
+    $gdnsresourcefile->print("  }\n");
+    $gdnsresourcefile->print("}\n");
+
+    $gdnsweightedfile->close();
+    $gdnsresourcefile->close();
+    $gdnsmapfile->close();
+}

 
 # Output the target details in origin format if required
 
 # Output the target details in origin format if required

-YAML::DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile;
+DumpFile($targetoriginfile, $targetorigins) if $targetoriginfile;

 
 exit 0;
 
 
 exit 0;
 


@@ -268,8 +451,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";
+    }
+    elsif ($cluster->{allowed} &&
+           $cluster->{allowed}->{origins} &&
+           grep { $_ eq $origin->{name} } @{$cluster->{allowed}->{origins}})
+    {
+        $match = "allowed";
+    }
+    elsif ($cluster->{preferred} &&
+           $cluster->{preferred}->{countries} &&
+           grep { $_ eq $origin->{country} } @{$cluster->{preferred}->{countries}})

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


@@ -336,7 +531,7 @@ sub allocate_clusters
     my @mappings = sort { compare_mappings($a, $b) } @_;
 
     # Loop over the mappings, trying to assign each origin to the
     my @mappings = sort { compare_mappings($a, $b) } @_;
 
     # Loop over the mappings, trying to assign each origin to the

-    # nearest cluster, but subject to the bandwidth limits
+    # nearest cluster, but subject to the request limits

     while (my $mapping = shift @mappings)
     {
         my @group;
     while (my $mapping = shift @mappings)
     {
         my @group;


@@ -348,16 +543,16 @@ sub allocate_clusters
             push @group, shift @mappings;
         }
 
             push @group, shift @mappings;
         }
 

-        for my $mapping (sort compare_bandwidth @group)
+        for my $mapping (sort compare_requests @group)

         {
             my $origin = $mapping->{origin};
             my $cluster = $mapping->{cluster};
 
             if (!exists($origin->{cluster}) &&
         {
             my $origin = $mapping->{origin};
             my $cluster = $mapping->{cluster};
 
             if (!exists($origin->{cluster}) &&

-                $cluster->{bandwidth_used} + $origin->{bandwidth} <= $cluster->{bandwidth_limit})
+                $cluster->{requests_used} + $origin->{requests} <= $cluster->{requests_limit})

             {
                 $origin->{cluster} = $cluster;
             {
                 $origin->{cluster} = $cluster;

-                $cluster->{bandwidth_used} = $cluster->{bandwidth_used} + $origin->{bandwidth};
+                $cluster->{requests_used} = $cluster->{requests_used} + $origin->{requests};

             }
         }
     }
             }
         }
     }


@@ -380,10 +575,10 @@ sub compare_mappings
 #
 # Compare two mappings to decide which to try first
 #
 #
 # Compare two mappings to decide which to try first
 #

-sub compare_bandwidth
+sub compare_requests

 {
 {

-    my $a_used = ( $a->{cluster}->{bandwidth_used} * 100.0 ) / ( $a->{cluster}->{bandwidth_limit} * 1.0 );
-    my $b_used = ( $b->{cluster}->{bandwidth_used} * 100.0 ) / ( $b->{cluster}->{bandwidth_limit} * 1.0 );
+    my $a_used = ( $a->{cluster}->{requests_used} * 100.0 ) / ( $a->{cluster}->{requests_limit} * 1.0 );
+    my $b_used = ( $b->{cluster}->{requests_used} * 100.0 ) / ( $b->{cluster}->{requests_limit} * 1.0 );

 
     return $a_used <=> $b_used;
 }
 
     return $a_used <=> $b_used;
 }


@@ -396,16 +591,20 @@ sub output_server
     my $zonefile = shift;
     my $name = shift;
     my $cluster = shift;
     my $zonefile = shift;
     my $name = shift;
     my $cluster = shift;

+    my $all = shift;

 
 

-    foreach my $server (@{$cluster->{servers}})
+    while (my($index,$server) = each @{$cluster->{servers}})

     {
     {

-        if ($server->{status} eq "up")
+        if ($all || $server->{status} eq "up")

         {
         {

-            $zonefile->print("+${name}:$server->{ipv4}:3600\n");
+            if ($server->{ipv4})
+            {
+                $zonefile->printf("  A(\"${name}\", \"$server->{ipv4}\", TTL(\"10m\")),\n", $index + 1);
+            }

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

-#                $zonefile->print("3${name}:$server->{ipv6}:3600\n");
+                $zonefile->printf("  AAAA(\"${name}\", \"$server->{ipv6}\", TTL(\"10m\")),\n", $index + 1);

             }
         }
     }
             }
         }
     }