X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/b7a789408d516daf93bea803f628bf3e69b9d5d0..eac669f342caf87dcdfd5444e10052b6db1fd1e4:/bin/mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 7b70c22..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}
@@ -57,46 +57,66 @@ foreach my $server (@servers)
     $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_USERNAME} && $ENV{STATUSCAKE_APIKEY})
 {
     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("Username", $ENV{STATUSCAKE_USERNAME});
+    $ua->default_header("API", $ENV{STATUSCAKE_APIKEY});
 
-    if (-f "pingdom.yml")
+    if (-f "statuscake.yml")
     {
-        $cache = YAML::LoadFile("pingdom.yml"); 
+        $cache = YAML::LoadFile("statuscake.yml");
     }
     else
     {
         $cache = {};
     }
 
-    foreach my $server (@servers)
+    my $response = $ua->get("https://app.statuscake.com/API/Tests/");
+
+    if ($response->is_success)
     {
-        if (my $checkid = $server->{pingdom})
+        my $tests = decode_json($response->content);
+
+        foreach my $test (@$tests)
         {
-            my $response = $ua->get("https://api.pingdom.com/api/2.0/checks/${checkid}");
+            my $testid = $test->{TestID};
 
-            if ($response->is_success)
+            if ($test->{Status} eq "Up" && !$test->{Paused})
             {
-                my $check = decode_json($response->content);
-
-                $server->{status} = $check->{check}->{status};
-                $cache->{$server->{pingdom}} = $check->{check}->{status};
+                $cache->{$testid} = "up";
             }
             else
             {
-                $server->{status} = $cache->{$server->{pingdom}} || "down";
+                $cache->{$testid} = "down";
             }
         }
     }
 
-    YAML::DumpFile("pingdom.yml", $cache);
+    foreach my $server (@servers)
+    {
+        if (my $testids = $server->{statuscake})
+        {
+            $server->{status} = "up";
+
+            for my $testid (@$testids)
+            {
+                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
@@ -185,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
-foreach my $origin (values %$origins)
+foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
 {
     my $cluster = $origin->{cluster};
     my $clon = $origin->{lon};
@@ -225,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);
@@ -241,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);
 }
 
@@ -401,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");
             }
         }
     }