From c72c2a52832b17274f6b680819bbfc645560504d Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 18 Aug 2021 08:13:39 -0700 Subject: [PATCH 01/55] fix emails import --- go.mod | 1 - go.sum | 2 -- notifiers/email.go | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d916b764..5d673acc 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( github.com/sirupsen/logrus v1.6.0 github.com/spf13/cobra v1.0.0 github.com/spf13/viper v1.6.3 - github.com/statping/emails v1.0.0 github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.6.1 github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1 diff --git a/go.sum b/go.sum index a40a4e39..af778bcf 100755 --- a/go.sum +++ b/go.sum @@ -583,8 +583,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs= github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw= -github.com/statping/emails v1.0.0 h1:90hGweEhr8wIFiy34KCkiFqGJlkug2gAQLVR6oSCFNU= -github.com/statping/emails v1.0.0/go.mod h1:xFU85jXaiWQadqHqu/jDrGsAn6WPSk1WgKyTVuFm0TI= github.com/statping-ng/statping-ng v0.90.64/go.mod h1:lbyNPB73IjWtnommV4wSejYfgUT1yLhhqelMjl1ZBb8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= diff --git a/notifiers/email.go b/notifiers/email.go index bdbb75ca..c5b61390 100644 --- a/notifiers/email.go +++ b/notifiers/email.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/go-mail/mail" - "github.com/statping/emails" + "github.com/statping-ng/emails" "github.com/statping-ng/statping-ng/types/core" "github.com/statping-ng/statping-ng/types/failures" "github.com/statping-ng/statping-ng/types/notifications" From 28c6e68f3a1d1ef2a8fa930a47f0749b9e731428 Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Thu, 19 Aug 2021 02:47:46 -0700 Subject: [PATCH 02/55] add email version to go.mod --- go.mod | 1 + go.sum | 94 ++++------------------------------------------------------ 2 files changed, 6 insertions(+), 89 deletions(-) diff --git a/go.mod b/go.mod index 5d673acc..1ef350e1 100644 --- a/go.mod +++ b/go.mod @@ -23,6 +23,7 @@ require ( github.com/sirupsen/logrus v1.6.0 github.com/spf13/cobra v1.0.0 github.com/spf13/viper v1.6.3 + github.com/statping-ng/emails v1.0.3 github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.6.1 github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1 diff --git a/go.sum b/go.sum index af778bcf..231daf1e 100755 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -74,7 +73,6 @@ github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EF github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= github.com/GeertJohan/go.rice v1.0.0 h1:KkI6O9uMaQU3VEKaj01ulavtF7o1fWT7+pk/4voiMLQ= github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0= @@ -83,7 +81,6 @@ github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4K github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87 h1:xPMsUicZ3iosVPSIP7bW5EcGUzjiiMl1OYTe14y/R24= github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks= -github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398 h1:WDC6ySpJzbxGWFh4aMxFFC28wwGp5pEuoTtvA4q/qQ4= github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= @@ -91,7 +88,6 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.8/go.mod h1:aVvklgKsPENRkl29bNwrHISa1F+YLGTHArMxZMBqWM8= github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.11 h1:QGjNHMwoPYxE5NpOAc8kpd2KTY293/oFk5BWdjkza+k= github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.11/go.mod h1:L+HB2uBoDgi3+r1pJEJcbGwyyHhd2QXaGsKLbDwtm8Q= -github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw= github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -104,7 +100,6 @@ github.com/aws/aws-sdk-go v1.30.20 h1:ktsy2vodSZxz/arYqo7DlpkIeNohHL+4Rmjdo7YGtr github.com/aws/aws-sdk-go v1.30.20/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -113,7 +108,6 @@ github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4ea github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -134,10 +128,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpu/goacmedns v0.0.2 h1:hYAgjnPu7HogTgb8trqQouR/RrBgXq1TPBgmxbK9eRA= github.com/cpu/goacmedns v0.0.2/go.mod h1:4MipLkI+qScwqtVxcNO6okBhbgRrr7/tKXUSgSL0teQ= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/daaku/go.zipexe v1.0.0 h1:VSOgZtH418pH9L16hC/JrgSNJbbAL26pj7lmD1+CGdY= @@ -145,7 +137,6 @@ github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CL github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e h1:LzwWXEScfcTu7vUZNlDDWDARoSGEtvlDKK2BYHowNeE= github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= @@ -160,7 +151,6 @@ github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s9 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnsimple/dnsimple-go v0.60.0 h1:N+q+ML1CZGf+5r4udu9Opy7WJNtOaFT9aM86Af9gLhk= github.com/dnsimple/dnsimple-go v0.60.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= @@ -183,7 +173,6 @@ github.com/foomo/simplecert v1.7.5 h1:5654G52nAaFGdIjQsjCbccqkQraN9oa2qvh4Ugtc+r github.com/foomo/simplecert v1.7.5/go.mod h1:RojYROT3nMm8GtJZAPUz0sM5YuSQ/6MIdZvtLTqsxbc= github.com/foomo/tlsconfig v0.0.0-20180418120404-b67861b076c9 h1:RPOsDNbnDUFaSt/3bCxUsaGCJsKqA6dGubevl20nE9g= github.com/foomo/tlsconfig v0.0.0-20180418120404-b67861b076c9/go.mod h1:OdiGKKgTAfMv7x9Hh9qYFueue77tr09LUAxwy2+M8wY= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -197,7 +186,6 @@ github.com/go-acme/lego/v3 v3.7.0 h1:qC5/8/CbltyAE8fGLE6bGlqucj7pXc/vBxiLwLOsmAQ github.com/go-acme/lego/v3 v3.7.0/go.mod h1:4eDjjYkAsDXyNcwN8IhhZAwxz9Ltiks1Zmpv0q20J7A= github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.0.2 h1:xMxH9j2fNg/L4hLn/4y3M0IUsn0M6Wbu/Uh9QlOfBh4= github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs= @@ -213,7 +201,6 @@ github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AE github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-resty/resty/v2 v2.2.0 h1:vgZ1cdblp8Aw4jZj3ZsKh6yKAlMg3CHMrqFSFFd+jgY= github.com/go-resty/resty/v2 v2.2.0/go.mod h1:nYW/8rxqQCmI3bPz9Fsmjbr2FBjGuR2Mzt6kDh3zZ7w= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= @@ -223,7 +210,6 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -244,23 +230,19 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomarkdown/markdown v0.0.0-20200820230800-3724143f5294 h1:rSb2ZQZ3B1rlWBWamxobyn0jTuGZHbPO5Rmjw48uWRM= github.com/gomarkdown/markdown v0.0.0-20200820230800-3724143f5294/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -268,7 +250,6 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= @@ -325,20 +306,15 @@ github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhK github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/iris-contrib/blackfriday v2.0.0+incompatible h1:o5sHQHHm0ToHUlAJSTjW9UWicjJSDDauOOQ2AHuIVp4= github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= -github.com/iris-contrib/go.uuid v2.0.0+incompatible h1:XZubAYg61/JwnJNbZilGjf3b3pB80+OQg2qf6c8BfWE= github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= -github.com/iris-contrib/schema v0.0.1 h1:10g/WnoRR+U+XXHWKBHeNy/+tZmM2kcAVGLOsz+yaDA= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= -github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= @@ -347,7 +323,6 @@ github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= @@ -361,26 +336,19 @@ github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVE github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/kataras/golog v0.0.9 h1:J7Dl82843nbKQDrQM/abbNJZvQjS6PfmkkffhOTXEpM= github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= -github.com/kataras/iris/v12 v12.0.1 h1:Wo5S7GMWv5OAzJmvFTvss/C4TS1W0uo6LkDlSymT4rM= github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= -github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d h1:V5Rs9ztEWdp58oayPq/ulmlqJJZeJP6pP79uP3qjcao= github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.0 h1:GhthINjveNZAdFUD8QoQYfjxnOONZgztK/Yr6M23UTY= github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ= github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b h1:DzHy0GlWeF0KAglaTMY7Q+khIFoG8toHP+wLFBVBQJc= github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -398,7 +366,6 @@ github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvf github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/lextoumbourou/goodhosts v2.1.0+incompatible h1:1U1p5Z1wrXl23/fW/GY4zdTbQ8UJbyvrkPbqAZ6tzbw= github.com/lextoumbourou/goodhosts v2.1.0+incompatible/go.mod h1:89s48k108X3gKDWn8AHk3gUzUGTcMZCCAOsE4QU1bbo= -github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -412,17 +379,14 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= -github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -432,7 +396,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= -github.com/microcosm-cc/bluemonday v1.0.2 h1:5lPfLTTAvAbtS0VqT+94yOtFnGfUWYyx0+iToC3Os3s= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg= @@ -440,7 +403,6 @@ github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4= github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -461,7 +423,6 @@ github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229 h1:E2B8qYyeSgv5MXpmzZXRNp8IAQ4vjxIjhpAf5hv/tAg= github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= github.com/nrdcg/auroradns v1.0.1 h1:m/kBq83Xvy3cU261MOknd8BdnOk12q4lAWM+kOdsC2Y= github.com/nrdcg/auroradns v1.0.1/go.mod h1:y4pc0i9QXYlFCWrhWrUSIETnZgrf4KuwjDIWmmXo3JI= @@ -487,7 +448,6 @@ github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014 h1:37VE5TYj2m/FLA9SNr4z github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= @@ -502,7 +462,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3 h1:9iH4JKXLzFbOAdtqv/a+j8aewx2Y8lAjAydhbaScPF8= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8= @@ -514,14 +473,12 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCb github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 h1:sofwID9zm4tzrgykg80hfFph1mryUeLRsUfoocVVmRY= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= @@ -531,23 +488,17 @@ github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKc github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sacloud/libsacloud v1.26.1/go.mod h1:79ZwATmHLIFZIMd7sxA3LwzVy/B77uj3LDoToVTxDoQ= github.com/sacloud/libsacloud v1.36.1 h1:tCpFjWsvu/2Im8/SDmRZ49SttVXy7nHerobRc1LU9pI= github.com/sacloud/libsacloud v1.36.1/go.mod h1:P7YAOVmnIn3DKHqCZcUKYUXmSwGBm3yS7IBEjKVSrjg= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= @@ -559,23 +510,18 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -583,16 +529,18 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs= github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw= -github.com/statping-ng/statping-ng v0.90.64/go.mod h1:lbyNPB73IjWtnommV4wSejYfgUT1yLhhqelMjl1ZBb8= +github.com/statping-ng/emails v1.0.3 h1:33YIG+OT/r7DtXSkoYhnt0rFEtR1KQGBkw3GeZDaQIk= +github.com/statping-ng/emails v1.0.3/go.mod h1:ulCTLCuyypX6vuyjGtrFD5RRvQhVmV17zyIgR53oYgo= +github.com/statping-ng/statping-ng v0.90.77/go.mod h1:dqjpNrrd4spZyRn9qZFDp9pD2nzEFmX7wY4x/stYXLY= +github.com/statping/emails v1.0.0/go.mod h1:xFU85jXaiWQadqHqu/jDrGsAn6WPSk1WgKyTVuFm0TI= +github.com/statping/statping v0.90.64/go.mod h1:lbyNPB73IjWtnommV4wSejYfgUT1yLhhqelMjl1ZBb8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -600,9 +548,7 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1 h1:HGVkRrwDCbmSP6h1CoBDj6l/mhnvsP5JbYaQ4ss0R6o= github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1/go.mod h1:I3xbaE9ud9/TEXzehwkHx86SyJwqeSNsX2X5oV61jIg= -github.com/tdewolff/minify/v2 v2.8.0 h1:t3tOPWkTpKhsgxm3IM9Sy8hE2eIt30Oaa+2havJGGIE= github.com/tdewolff/minify/v2 v2.8.0/go.mod h1:6zN8VLhMfFxNrwHROcboYNo2+huPNu4SV8DPh3PUQ8E= -github.com/tdewolff/parse/v2 v2.4.4 h1:uMdbQRtYbKR/msP9CbI7li9wK6pionYiH6s7ipltyGY= github.com/tdewolff/parse/v2 v2.4.4/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7 h1:CpHxIaZzVy26GqJn8ptRyto8fuoYOd1v0fXm9bG3wQ8= @@ -619,18 +565,14 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= -github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vultr/govultr v0.1.4/go.mod h1:9H008Uxr/C4vFNGLqKx232C206GL0PBHzOP0809bGNA= github.com/vultr/govultr v0.3.3 h1:fVaF4h9u3VzTXxFsxvgBUCiM52EiahLqAPkizamLzYM= github.com/vultr/govultr v0.3.3/go.mod h1:TUuUizMOFc7z+PNMssb6iGjKjQfpw5arIaOLfocVudQ= -github.com/wellington/go-libsass v0.9.2 h1:6Ims04UDdBs6/CGSVK5JC8FNikR5ssrsMMKE/uaO5Q8= github.com/wellington/go-libsass v0.9.2/go.mod h1:mxgxgam0N0E+NAUMHLcu20Ccfc3mVpDkyrLDayqfiTs= -github.com/wellington/sass v0.0.0-20160911051022-cab90b3986d6 h1:qPS12y9iMXyKr2flmOG7RgiyUGkQxQibp1hx7uug9IQ= github.com/wellington/sass v0.0.0-20160911051022-cab90b3986d6/go.mod h1:ncYBwTYUjmb7N+sZbf8WJYynLivoqFL+U2f8uOX2Yzk= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= @@ -652,7 +594,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -677,9 +618,7 @@ golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200406173513-056763e48d71 h1:DOmugCavvUtnUD114C1Wh+UgTgQZ4pMLzXxi1pSt+/Y= golang.org/x/crypto v0.0.0-20200406173513-056763e48d71/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a h1:y6sBfNd1b9Wy08a6K1Z1DZc4aXABUN5TKjkYhz7UKmo= golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -736,7 +675,6 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -745,17 +683,13 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA= golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -768,7 +702,6 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -794,7 +727,6 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -810,15 +742,12 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c= golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -866,13 +795,11 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4 h1:kDtqNkeBrZb8B+atrj50B5XLHpzXXqcCdZPP/ApQ5NY= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20201012192620-5bd05386311b h1:Imq6ZJ3mzzAkU1yzH1aHpiF3lTs3ySLzjH8SEfFdW0A= golang.org/x/tools v0.0.0-20201012192620-5bd05386311b/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -890,11 +817,9 @@ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.21.0 h1:zS+Q/CJJnVlXpXQVIz+lH0ZT2lBuT2ac7XD8Y/3w6hY= google.golang.org/api v0.21.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= @@ -904,7 +829,6 @@ google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= @@ -918,7 +842,6 @@ google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb h1:nAFaltAMbNVA0rixtwvdnqgSVLX3HFUUvMkEklmzbYM= google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= @@ -933,7 +856,6 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k= google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= @@ -941,18 +863,15 @@ google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLY google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -965,7 +884,6 @@ gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/R gopkg.in/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0= gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ= @@ -983,14 +901,12 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.0 h1:OZ4sdq+Y+SHfYB7vfthi1Ei8b0vkP8ZPQgUfUwdUSqo= gopkg.in/square/go-jose.v2 v2.5.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 62929e618eafb6714dda6db0067c8b8465d618b9 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 11:45:35 +0100 Subject: [PATCH 03/55] Added a build flag for windows see https://github.com/golang/go/issues/40795 --- .github/workflows/1_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index ee63b630..875f89c6 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -97,7 +97,7 @@ jobs: - name: Set Windows Build Flags if: matrix.platform == 'windows' run: | - echo "BUILD_FLAGS=-extldflags -static" >> $GITHUB_ENV + echo "BUILD_FLAGS=-extldflags -static -buildmode=exe" >> $GITHUB_ENV echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV shell: bash From 087abe332cccf6fa2f91c75e3a686a0d7f7357c1 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 11:53:43 +0100 Subject: [PATCH 04/55] make statping binary executable hopefully a good snap build --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 50e58acd..8689d224 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -35,6 +35,7 @@ parts: apt-get update apt-get install -y curl curl -o- -L https://raw.githubusercontent.com/statping-ng/statping-ng/stable/install.sh | bash + chmod +x /usr/local/bin/statping mv /usr/local/bin/statping ./ build-packages: - git From 10f1f1e0a6391860ae7468989d5bb80e69d3bd37 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 12:18:02 +0100 Subject: [PATCH 05/55] Testing changes to snap --- snapcraft.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 8689d224..dc4ce434 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -15,13 +15,13 @@ grade: stable architectures: - build-on: amd64 - - build-on: armhf - - build-on: arm64 - - build-on: i386 +# - build-on: armhf +# - build-on: arm64 +# - build-on: i386 apps: statping: - command: statping + command: ./statping plugs: - home - network @@ -35,7 +35,7 @@ parts: apt-get update apt-get install -y curl curl -o- -L https://raw.githubusercontent.com/statping-ng/statping-ng/stable/install.sh | bash - chmod +x /usr/local/bin/statping + ls /usr/local/bin/ mv /usr/local/bin/statping ./ build-packages: - git From 8eb71c8d0bfb3bf5569d237e18c0097ffc211b85 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 12:18:17 +0100 Subject: [PATCH 06/55] Fixed windows and darwin builds --- .github/workflows/1_dev.yml | 2 +- .github/workflows/2_unstable.yml | 66 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 875f89c6..0fa20664 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -143,7 +143,7 @@ jobs: if: matrix.platform == 'darwin' run: | cd build - mv statping-darwin-10.6-${{ matrix.arch }} statping + mv statping-darwin-10.12-${{ matrix.arch }} statping chmod +x statping tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping rm -rf statping diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index b927f7bb..c9a18933 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -61,11 +61,11 @@ jobs: matrix: platform: [linux] arch: [386, amd64, arm-7, arm-6, arm64] -# include: -# - platform: darwin -# arch: amd64 -# - platform: windows -# arch: amd64 + include: + - platform: darwin + arch: amd64 + - platform: windows + arch: amd64 steps: - uses: actions/checkout@v2 @@ -88,17 +88,17 @@ jobs: echo "XGO_TAGS=netgo osusergo linux sqlite_omit_load_extension" >> $GITHUB_ENV shell: bash -# - name: Set Darwin Build Flags -# if: matrix.platform == 'darwin' -# run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV -# shell: bash + - name: Set Darwin Build Flags + if: matrix.platform == 'darwin' + run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV + shell: bash - # - name: Set Windows Build Flags - # if: matrix.platform == 'windows' - # run: | - # echo "BUILD_FLAGS=-extldflags -static" >> $GITHUB_ENV - # echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV - # shell: bash + - name: Set Windows Build Flags + if: matrix.platform == 'windows' + run: | + echo "BUILD_FLAGS=-extldflags -static -buildmode=exe" >> $GITHUB_ENV + echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV + shell: bash - name: Build ${{ matrix.platform }}/${{ matrix.arch }} uses: crazy-max/ghaction-xgo@v1 @@ -128,25 +128,25 @@ jobs: rm -rf statping echo "compressed=statping-linux-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV -# - name: Compress Windows Builds -# if: matrix.platform == 'windows' -# run: | -# cd build -# mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe -# chmod +x statping.exe -# zip statping-windows-${{ matrix.arch }}.zip statping.exe -# rm -rf statping.exe -# echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV + - name: Compress Windows Builds + if: matrix.platform == 'windows' + run: | + cd build + mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe + chmod +x statping.exe + zip statping-windows-${{ matrix.arch }}.zip statping.exe + rm -rf statping.exe + echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV -# - name: Compress Darwin Builds -# if: matrix.platform == 'darwin' -# run: | -# cd build -# mv statping-darwin-10.6-${{ matrix.arch }} statping -# chmod +x statping -# tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping -# rm -rf statping -# echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + - name: Compress Darwin Builds + if: matrix.platform == 'darwin' + run: | + cd build + mv statping-darwin-10.12-${{ matrix.arch }} statping + chmod +x statping + tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping + rm -rf statping + echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - name: Upload Compiled Statping Binary uses: actions/upload-artifact@v1 From cd1eaeec1b2a5140487faef406d8b67cc141de28 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 12:32:34 +0100 Subject: [PATCH 07/55] retry snap --- snapcraft.yaml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index dc4ce434..0d4ec108 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -8,20 +8,21 @@ description: > status page with tons of features for you to build an even better status page. This Status Page generator allows you to use MySQL, Postgres, or SQLite on multiple operating systems. - +base: base type: app confinement: strict grade: stable +issues: https://github.com/statping-ng/statping-ng/issues architectures: - build-on: amd64 -# - build-on: armhf -# - build-on: arm64 -# - build-on: i386 + - build-on: armhf + - build-on: arm64 + - build-on: i386 apps: statping: - command: ./statping + command: statping plugs: - home - network @@ -33,12 +34,6 @@ parts: plugin: nil override-build: | apt-get update - apt-get install -y curl + apt-get install -y curl tar curl -o- -L https://raw.githubusercontent.com/statping-ng/statping-ng/stable/install.sh | bash - ls /usr/local/bin/ mv /usr/local/bin/statping ./ - build-packages: - - git - - gcc - - make - - sed From 7ee68350be01bd8eb28375f112a886008e8f1911 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 12:40:09 +0100 Subject: [PATCH 08/55] Version bump --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 993610d2..a8c28c37 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.90.77 +0.90.78 From 17e052e6ceb50757b934eae79f7d494e4547cb96 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 16:14:09 +0100 Subject: [PATCH 09/55] Updated changelog --- CHANGELOG.md | 381 ++------------------------------------------------- 1 file changed, 10 insertions(+), 371 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc77eac2..6ebf8478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,374 +1,13 @@ +# 0.90.78 (xx-xx-2021) +- Retrospectively updated the Changelog +- [GITHUB] Fixed Windows/Mac autobuilds +- [GITHUB] Triggers SNAP builds + +# 0.90.77 (08-18-2021) +- More branding changes +- Fix for go statping-ng/email deps (https://github.com/statping-ng/statping-ng/issues/9) +- [GITHUB] Fixed autobuilds + # 0.90.76 (08-13-2021) - Forked statping and renamed to statping-ng - Branding changes - -# 0.90.75 (12-20-2020) -- Removed favicons and PNG files from assets, now using base64 images -- Cleaned up some issues with UI - -# 0.90.74 (12-18-2020) -- Fixed issue with favicon/manifest.json throwing 404 errors -- Modified language go:generate script to slowdown for 429 errors -- Removed Sentry error logging functionality - -# 0.90.73 (12-15-2020) -- Removed complexity in code for http server -- Removed internal cache functionality (not useful, needs refactor) -- Merged PR https://github.com/statping-ng/statping-ng/pull/909 -- Merged PR https://github.com/statping-ng/statping-ng/pull/880 -- Merged PR https://github.com/statping-ng/statping-ng/pull/859 - -# 0.90.72 (10-28-2020) -- Fixed issue with graphs becoming stuck on reload - -# 0.90.71 (10-13-2020) -- Reverted Docker user in Dockerfile - -# 0.90.70 (10-1-2020) -- Merged PR #806 - Enhance GRPC Monitoring -- Merged PR #692 - When login fields are autofilled the sign in button should be enabled -- Modified multiple Vue forms to use number models for integer inputs -- Fixed page freeze issue for incidents https://github.com/statping-ng/statping-ng/issues/842 -- Modified cache routine from 5 seconds to 60 seconds - -# 0.90.69 (09-18-2020) -- Fixed issue with service view not loading. #808 #811 #800 - -# 0.90.68 (09-17-2020) -- Added DB_DSN env for mysql, postgres or sqlite DSN database connection string -- Added READ_ONLY env for a read only connection to the database -- Added Custom OAuth OpenID toggle switch in settings (appends 'openid' in scope) -- Fixed Custom OAuth response_type issue -- Added Configs tab in Settings to edit the config.yml from frontend - -# 0.90.67 (09-14-2020) -- Modified core settings to update config.yml on save -- Modified Theme Editor to restart the HTTP router on create/delete (fixing 404's) - -# 0.90.66 (09-08-2020) -- Added Import and Export views in Dashboard -- Modified services list sparkline to use start/end of day timestamp -- Modified i18n language files, added go generate script to automatically translate - -# 0.90.65 (09-01-2020) -- Fixed issue with dashboard not logging in (notifier panic) -- Modified static email templates to github.com/statping/emails -- Modified Regenerate API function to keep API_SECRET env -- Added DEMO_MODE env variable, if true, 'admin' cannot be deleted -- Modified Service sparklines on Dashboard -- Added modal popup for UI deletes/edits - -# 0.90.64 (08-18-2020) -- Modified max-width for container to 1012px, larger UI -- Added failure sparklines in the Services list view -- Added "Update Available" alert on the top of Settings if new version is available -- Added Version and Github Commit hash to left navigation on Settings page -- Added "reason" for failures (will be used for more custom notification messages) [regex, lookup, timeout, connection, close, status_code] -- Added Help page that is generated from Statping's Wiki repo on build -- Modified Service Group failures on index page to show 90 days of failures -- Modified Service view page, updated Latency and Ping charts, added failures below -- Modified Service chart on index page to show ping data along with latency -- Added AWS SNS Notifier -- Modified dashboard services UI -- Modified service.Failures API to include 32 failures (max) - -# 0.90.63 (08-17-2020) -- Modified build process to use xgo for all arch builds -- Modified Statping's Push Notifications server notifier to match with Firebase/gorush params - -# 0.90.62 (08-07-2020) -- Added Notification logs -- Fixed issues with Notifer After (x) failures for notifications -- Modified notifications to not send on initial startup -- Updated Incident UI -- Added additional testing for notifications -- Modified SCSS/SASS files to be generated from 1, main.scss to main.css -- Modified index page to use /assets directory for assets, (main.css, style.css) -- Modified index page to use CDN asset paths -- Fixed New Checkin form -- Modified email notifier template to be rendered from MJML (using go generate) -- Modified database relationships with services using gorm -- Modified "statping env" command to show user/group ID -- Removed "js" folder when exporting assets, js files are always version of release, not static JS files - -# 0.90.61 (07-22-2020) -- Modified sass layouts, organized and split up sections -- Modified Checkins to seconds rather than milliseconds (for cronjob) -- Modified Service View page to show data inside cards -- Fixed issue with uptime_data sending incorrect start/end timestamps -- Modified http cache to bypass if url has a "v" query param -- Added "Static Services" (a fake service that requires you to update the online/offline status) -- Added Update Static Service PATCH route (/api/services/{id}) -- Modified SASS api endpoints (base, layout, forms, mixins, mobile, variables) -- Added additional testing -- Modified node version from 10.x to 12.18.2 -- Modified Notifier's struct values to be NullString and NullInt to allow empty values -- Added Search ability to Logs in UI -- Fixed issue with Incidents and Checkins not being deleted once service is deleted - -# 0.90.60 (07-15-2020) -- Added LETSENCRYPT_ENABLE (boolean) env to enable/disable letsencrypt SSL - -# 0.90.59 (07-14-2020) -- Added LetsEncrypt SSL Generator by using LETSENCRYPT_HOST and LETSENCRYPT_EMAIL envs. -- Modified JWT token key to be sha256 of API Secret -- Modified github actions to build multi-arch Docker images -- Added "update" command to install latest version -- Fixed dashboard uptime_data API request to request correct start/time timestamp - -# 0.90.58 (07-09-2020) -- Fixed ICMP latency/ping durations -- Fixed webhook notifier -- Modified file structure for Vue admin dashboard components. -- Added Gotify notifier - -# 0.90.57 (07-04-2020) -- Fixed login issue - -# 0.90.56 (06-25-2020) -- Modified metrics now include service name for each service metric -- Added switch for true/false notifier values -- Added list for notifiers that have static values (in drop down) -- Fixed oAuth form saving -- Fixed some HTTP Cookie issues -- Added error if Theme Editor returns an error from API -- Added Pushover priority and sounds -- Added HTTP headers for outgoing requests (includes User-Agent=Statping and Statping-Version=0.90.55) -- Fixed Google oAuth handling -- Added Google oAuth email/domain user restrictions -- Modified notifiers to use dereferenced services and failures -- Added core.Example() function for testing -- Added Custom oAuth Authentication method -- Fixed setup form not creating user from values inputted in form -- Fixed issues with Telegram Notifier -- Modified notifier test handler to return notifier based on URL, not JSON payload - -# 0.90.55 (06-18-2020) -- Added 404 page -- Modified Statping's PR process, dev -> master -- Fixed Discord notifier -- Modified email template for SMTP emails -- Added OnSave() method for all notifiers - -# 0.90.54 (06-17-2020) -- Fixed Slack Notifier's failure/success data saving issue -- Added additional i18n Languages (help needed!) - -# 0.90.53 (06-16-2020) -- Modified most of the key's for prometheus metrics -- Added Database Stats in prometheus metrics -- Added object query counts in prometheus metrics - -# 0.90.52 (06-15-2020) -- Fixed NOT NULL sql field - -# 0.90.51 (06-15-2020) -- Fix Theme Editor codemirror inputs to show on load -- Added favicon folder for local assets can be used without remote access -- Modified Notifier's to return the response as a string for the frontend -- Modified Notifiers so they can use custom data for their request -- Added Notifier OnSuccess and onFailure custom data on frontend - -# 0.90.50 (06-13-2020) -- Removed PORT, replaced with SERVER_PORT -- Removed HOST/IP, replaced with SERVER_IP - -# 0.90.49 (06-12-2020) -- Added additional prometheus /metrics for better debugging - -# 0.90.48 (06-11-2020) -- Modified shutdown routine to make command exit with code 0 -- Modified install.sh for correct installation - -# 0.90.47 (06-10-2020) -- Fixed Urgent bug taking 100% of CPU (Timer) -- Modified HTTP server, now in it's own go routine/channel -- Fixed Service form for editing -- Added pprof golang debugging http server if `GO_ENV` == "test" -- Added `HOST` env variable (hostname for http server) -- Added `DISABLE_HTTP` env variable (defaults to false, disables the http server) -- Added `DISABLE_COLORS` env variable (default to false, disables color encoding for logs) -- Added `LOGS_MAX_COUNT` -- Added `LOGS_MAX_AGE` -- Added `LOGS_MAX_SIZE` -- Added `DEBUG` (starts a pprof golang debugging http server on port 9090, defaults to false) -- Confirmed `DISABLE_LOGS` is working -- Modified Mobile Notifier to fit new push notification server endpoint -- PR Merged: Fix time conversion in overview and charts #645 -- PR Merged: Wait for cmd reads to complete before calling Wait() #626 -- PR Merged: separate command options and option arguments #623 - -# 0.90.46 (06-04-2020) -- Add i18n language translations for frontend -- Added PR for heatmap https://github.com/statping-ng/statping-ng/pull/589 -- Added Statping newsletter option during /setup mode -- Fix for disabling logs with `DISABLE_LOGS` env - -# 0.90.45 (06-01-2020) -- Merged PR [#612](https://github.com/statping-ng/statping-ng/pull/612) for edit/create service issue. - -# 0.90.44 (05-25-2020) -- Modified Makefile to include "netgo" tag during golang build - -# 0.90.43 (05-21-2020) -- Fixed service TLS checkbox form for edit and create -- Modified ICMP ping's to use system's "ping" command (doesn't need root access) - -# 0.90.42 (05-20-2020) -- Fixed TCP services that dont use TLS. - -# 0.90.41 (05-20-2020) -- Added TLS Client Cert/Key feature for HTTP and TCP/UDP services -- Replaced environment variable ADMIN_PASS to ADMIN_PASSWORD. - -# 0.90.40 (05-18-2020) -- Fixed issues with MySQL and Postgres taking forever to insert sample data (now run in bulk) -- Removed API Authentication for /api/logout route -- Modified Core Sample/Upstart row to include NAME, DESCRIPTION, and DOMAIN environment vars (also added default values) - -# 0.90.39 (05-15-2020) -- Modified some SCSS designs for services failures in group -- Fixed Twilio notifier and tests - -# 0.90.38 (05-10-2020) -- Added service timeframe/interval on index charts -- Added --config flag to specify config.yml file -- Modified multiple files for simple UX fixes - -# 0.90.37 (05-04-2020) -- Fixed authentication issues dealing with cookies -- Modified build process, arm/arm64 couldnt run sqlite - -# 0.90.36 (05-02-2020) -- Fixed Notifier golang templating func to use correct variables - -# 0.90.35 (05-01-2020) -- Fixed issue with API endpoints cannot accepting Authorization header -- Fixed issue with sass executable not being found, SASS environment var re-implemented -- Added additional Postman API doc endpoints - -# 0.90.34 (04-28-2020) -- Added missing information to Mail notification ([#472](https://github.com/statping-ng/statping-ng/issues/472)) -- Added service.yml file to auto create services (https://github.com/statping-ng/statping-ng/wiki/services.yml) -- Removed Core API_KEY, (unused code, use API_SECRET) - -# 0.90.33 (04-24-2020) -- Fixed config loading method - -# 0.90.32 (04-23-2020) -- Modified the saving and loading process config.yml - -# 0.90.31 (04-21-2020) -- Version bump for github actions - -# 0.90.30 (04-19-2020) -- Attempt to fix Github Actions build process -- Fix for empty database connection string, and not starting in setup mode - -# 0.90.29 (04-19-2020) -- Added HTTP Redirects for services -- Removed use of SASS environment variable, now finds path or sends error -- Modified Makefile to create new snapcraft versions -- Fixed issue when logs are not initiated yet. Issue #502 -- Fixed issue when SQLite (statping.db) is not found Issue #499 -- Modified port flag in Docker image -- Fixed issue on startup without config.yml file not starting in setup mode - -# 0.90.28 (04-16-2020) -- Fixed postgres timestamp grouping -- Added postman (newman) API testing -- Added Viper and Cobra config/env parsing package -- Added more golang tests -- Modified handlers to use a more generic find method -- Added 'env' command to show variables used in config -- Added 'reset' command that will delete files and backup .db file for a fresh install -- Added error type that has common errors with http status code based on error - -# 0.90.27 (04-15-2020) -- Fixed postgres database table creation process -- Modified go build process, additional ARCHs -- Added 'SAMPLE_DATA' environment variable to disable example data on startup. (default: true) - -# 0.90.26 (04-13-2020) -- Fixed Delete Failures button/function -- Removed timezone field from Settings (core) -- Modified CDN asset URL -- Fixed single Service view, more complex charts - -# 0.90.25 -- Added string response on OnTest for Notifiers -- Modified UI to show user the response for a Notifier. -- Modified some Notifiers title's -- Added more Cypress e2e testing -- Modified Incidents form and UX. -- Added /api/services/{id}/uptime_data API endpoint to show online/offline durations as a series for charts. -- Modified index page to automatically refresh Service details on interval - -# 0.90.24 -- Fixed login form from not showing - -# 0.90.23 -- Added Incident Reporting -- Added Cypress tests -- Added Github and Google OAuth login (beta) -- Added Delete All Failures -- Added Checkin form -- Added Pushover notifier - -# 0.90.22 -- Added range input types for integer form fields -- Modified Sentry error logging details -- Modified form field layouts for better UX. -- Modified Notifier form -- Fixed Notifier Test form and logic - -# 0.90.21 -- Fixed BASE_PATH when using a path for Statping -- Added Cypress testing -- Modified SQLite golang package -- Modified SQLite connection limit, and idle limit. (defaults to 25) -- Fixed installation to use project name and description from form post - -# 0.90.20 -- Fixed Service Form from sending integer values as strings to API -- Added Cypress e2e testing (working on adding more) - -# 0.90.19 -- Fixed private Services from showing in API (/api/services and /api/services/{id}) -- Removed unused code - -# 0.90.18 -- Added service type gRPC, you can now check on gRPC services. (limited) - -# 0.90.17 -- Fixed notification fields for frontend -- Fixed notification JSON form to send integer if value is an integer. -- Added testing for notifiers - -# 0.90.16 -- Added Notify After (int) field for Services. Will send notifications after x amount of failures. -- Added new method in utils package for replacing `{{.Service.*}}` and `{{.Failure.*}}` variables from string to it's true value -- Fixed Notifer get endpoint -- Cleaned Notifier methods -- Updated recommended changes from [sonarcloud.io](https://sonarcloud.io/organizations/statping/projects) -- Organized utils package files - -# 0.90.15 -- Fixed /dashboard authentication state to show admin tabs if your an admin. [Issue #438](https://github.com/statping-ng/statping-ng/issues/438) -- Fixed Cache JS error on Dashboard - -# 0.90.14 -- Updated SCSS compiling, and confirmed it works. -- Added `$container-color` SCSS variable. -- Fixed issue with JWT token (nil pointer) for the Cookie name - -# 0.90.13 -- Added new function `utils.RenameDirectory` to rename directory -- Added new function `(*DbConfig) BackupAssets` to backup a customized theme and place into a directory named `assets_backup`. Only for migration 0.80 to 0.90+, entirely new frontend. -- Updated JS function `convertToChartData` to return an empty chart data if API response was empty. -- Updated `banner.png` to make a bit smaller, (680px) -- Fixed method that returns `no such table: services` on startup, check table first. -- Fixed version from not being added into Core table. [Issue #436](https://github.com/statping-ng/statping-ng/issues/436) - -# 0.90.12 -- Fixed MySQL timestamp formatting. (issue #432) From bd8061a8f6e6091697c239b26f1cdc59884a7878 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 16:39:41 +0100 Subject: [PATCH 10/55] Enable 32bit mac and windows build as a test --- .github/workflows/1_dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 0fa20664..a00c6545 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -63,9 +63,9 @@ jobs: arch: [386, amd64, arm-7, arm-6, arm64] include: - platform: darwin - arch: amd64 + arch: [386, amd64] - platform: windows - arch: amd64 + arch: [386, amd64] steps: - uses: actions/checkout@v2 From e88c26364b8c927d572d777f473aaddfd10fde94 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 20 Aug 2021 17:07:32 +0100 Subject: [PATCH 11/55] Fixed multi-arch compression on mac and windows builds --- .github/workflows/1_dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index a00c6545..22282697 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -129,7 +129,7 @@ jobs: rm -rf statping echo "compressed=statping-linux-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - - name: Compress Windows Builds + - name: Compress Windows ${{matrix.arch}} Builds if: matrix.platform == 'windows' run: | cd build @@ -139,7 +139,7 @@ jobs: rm -rf statping.exe echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV - - name: Compress Darwin Builds + - name: Compress Darwin ${{matrix.arch}} Builds if: matrix.platform == 'darwin' run: | cd build From adb0c5682a745237d8594ae1ec73f3871c072b55 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 23 Aug 2021 10:25:28 +0100 Subject: [PATCH 12/55] Update README.md Updated a docker link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8b7fe87..bad9d4b1 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Statping-ng is built in Go Language so all you need is the precompile binary bas                      - +

From 4611f9e66d79b7738b00ddccde115c972f9b800b Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Tue, 24 Aug 2021 13:13:29 +0100 Subject: [PATCH 13/55] Updated README --- README.md | 208 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 124 insertions(+), 84 deletions(-) diff --git a/README.md b/README.md index bad9d4b1..883f3323 100644 --- a/README.md +++ b/README.md @@ -1,112 +1,152 @@ -

- +

+ Statping-ng +

+

+ Statping-ng - Web and App Status Monitoring for Any Type of Project

-

- Statping-ng - Web and App Status Monitoring for Any Type of Project
- Website | View Wiki | API +

+ Website | + Wiki
- Docker | Linux | Mac | Windows + Linux | + Windows | + Mac | + Containers

-# Statping-ng - Status Page & Monitoring Server - -An easy to use Status Page for your websites and applications. Statping will automatically fetch the application and render a beautiful status page with tons of features for you to build an even better status page. This Status Page generator allows you to use MySQL, Postgres, or SQLite on multiple operating systems. - +

Statping-ng - Status Page & Monitoring Server

+

An easy to use Status Page for your websites and applications. Statping will automatically fetch the application and render a beautiful status page with tons of features for you to build an even better status page. This Status Page generator allows you to use MySQL, Postgres, or SQLite on multiple operating systems. +

Statping-ng aims to be an updated drop-in replacement of statping after development stopped on the original fork. - -![GitHub license](https://img.shields.io/github/license/statping-ng/statping-ng?color=green&style=for-the-badge) ![GitHub last commit](https://img.shields.io/github/last-commit/statping-ng/statping-ng?style=for-the-badge) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/statping-ng/statping-ng/2.%20Unstable%20Build,%20Test%20and%20Deploy?label=Dev%20Build&style=for-the-badge) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/statping-ng/statping-ng/3.%20Stable%20Build,%20Test%20and%20Deploy?label=Stable%20Build&style=for-the-badge) ![Docker Pulls](https://img.shields.io/docker/pulls/adamboutcher/statping-ng?style=for-the-badge) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/adamboutcher/statping-ng/latest?style=for-the-badge) - -

- -

A Future-Proof Status Page

-Statping-ng strives to remain future-proof and remain intact if a failure is created. Your Statping service should not be running on the same instance you're trying to monitor. If your server crashes your Status Page should still remaining online to notify your users of downtime. - -
(dashboard login is `admin`, password `admin`) -


- -

No Requirements

-Statping-ng is built in Go Language so all you need is the precompile binary based on your operating system. You won't need to install anything extra once you have the Statping binary installed. You can even run Statping on a Raspberry Pi. -

-

-        -        -        -        -        - -

- - - -

Lightweight and Fast

-Statping-ng is a very lightweight application and is available for Linux, Mac, and Windows. The Docker image is only ~16Mb so you know that this application won't be filling up your hard drive space. -The Status binary for all other OS's is ~17Mb at most. -





- - -

Mobile App is Gorgeous

-The Statping app is available on the App Store and Google Play for free. The app will allow you to view services, receive notifications when a service is offline, update groups, users, services, messages, and more! Start your own Statping-ng server and then connect it to the app by scanning the QR code in settings. - -

- -

-

+

+ License +

+ Last Commit + Dev Build Status + Unstable Build Status + Stable Build Status +

+ Docker Pulls + Docker Image Size +

+ Go Version + Go Report +

-## Run on Any Server -Want to run it on your own Docker server? Awesome! Statping-ng has multiple docker-compose.yml files to work with. Statping-ng can automatically create a SSL Certification for your status page. -



+
+

About Statping-ng

- -

Custom SASS Styling

-Statping-ng will allow you to completely customize your Status Page using SASS styling with easy to use variables. The Docker image actually contains a prebuilt SASS binary so you won't even need to setup anything! -



+ +

A Future-Proof Status Page

+

+ Statping-ng strives to remain future-proof and remain intact if a failure is created. Your Statping-ng service should not be running on the same instance you're trying to monitor. If your server crashes your Status Page should still remaining online to notify your users of downtime. +

+

+ Try Statping-ng via Play with Docker - Login is admin, password admin. +

+


-## Slack, Email, Twilio and more -Statping-ng includes email notification via SMTP and Slack integration using [Incoming Webhook](https://api.slack.com/incoming-webhooks). Insert the webhook URL into the Settings page in Statping-ng and enable the Slack integration. Anytime a service fails, the channel that you specified on Slack will receive a message. -



-

User Created Notifiers

-View the [Plugin Wiki](https://github.com/statping-ng/statping-ng/wiki/Statping-Plugins) to see detailed information about Golang Plugins. Statping-ng isn't just another Status Page for your applications, it's a framework that allows you to create your own plugins to interact with every element of your status page. [Notifier's](https://github.com/statping-ng/statping-ng/wiki/Notifiers) can also be create with only 1 golang file. -



+

No Requirements - Run on Any Server

+

+Statping-ng is built in Go Language so all you need is the pre-compiled binary based on your operating system. You won't need to install anything extra once you have the Statping binary installed. Windows, Linux or Mac, We compile to all the popular systems, including Raspberry Pi! +

+

+Linux +Windows +Apple Mac +Containers +Android Play Store +Apple Apps Store +

+
+


- -



+ +

Lightweight and Fast

+

+Statping-ng is a very lightweight application and is available for Linux, Mac, and Windows. The Docker image is only ~20Mb so you know that this application won't be filling up your hard drive space. +The Status binary for all other OS's is ~17Mb at most. +

+



- + +

Want easy containers?

+

+No Worries, we provide docker containers for many different system architectures, with multiple docker-compose files to suit your needs, you can even bring your own SSL Certificate or automatically leverage Lets Encrypt to keep things secure. But it's can be as simple as a docker run! +

+


+ + + +

Custom SASS Styling

+Statping-ng will allow you to completely customize your Status Page using SASS styling with easy to use variables. The container image actually contains a pre-built SASS binary so you won't even need to setup anything! +



+ + + +

Compatible with the Statping App

+

+Statping-ng is 100% compatible with the statping app which is available on the Apple App Store and Google Play for free. The app will allow you to view services, receive notifications when a service is offline, update groups, users, services, messages, and more! Start your own Statping-ng server and then connect it to the app by scanning the QR code in settings.

+

+ + +

+

The mobile app is not maintained by statping-ng and includes in-app purchases to the developer of statping.

+


+ +

Notifications - Slack, Email, Twilio and more

+

Statping-ng includes email notification via SMTP and Slack integration using Incoming Webhook. Insert the webhook URL into the Settings page in Statping-ng and enable the Slack integration. Anytime a service fails, the channel that you specified on Slack will receive a message.

+

View the Plugin Wiki to see detailed information about Golang Plugins. Statping-ng isn't just another Status Page for your applications, it's a framework that allows you to create your own plugins to interact with every element of your status page. Notifier's can also be create with only 1 golang file.

+



+ + +

Easy to use Dashboard

-Having a straight forward dashboard makes Statping-ng that much better. Monitor your websites and applications with a basic HTTP GET request, or add a POST request with your own JSON to post to the endpoint. -



+

+Having a straight forward dashboard makes Statping-ng that much better. Quickly and Easy view statuses. Monitor your websites and applications with a basic HTTP GET request, or add a POST request with your own JSON to post to the endpoint.

+




+ + + + + + +

Quick Start

+

Here's a few quick start guides to get you going, fast.

+ +

Docker

+

Use the Statping Docker Image to create a status page in seconds. Checkout the Docker Wiki to view more details on how to get started using Docker. +

-## Run on Docker -Use the [Statping Docker Image](https://hub.docker.com/r/adamboutcher/statping-ng) to create a status page in seconds. Checkout the [Docker Wiki](https://github.com/statping-ng/statping-ng/wiki/Docker) to view more details on how to get started using Docker. ```bash docker run -it -p 8080:8080 adamboutcher/statping-ng ``` -There are multiple ways to startup a Statping-ng server. You want to make sure Statping-ng is on it's own instance that is not on the same server as the applications you wish to monitor. It doesn't look good when your Status Page goes down. -



-## Docker Compose -In this folder there is a standard docker-compose file that include nginx, postgres, and Statping-ng. +

Docker Compose

+

In the root (base) folder there is a standard docker-compose file that includes nginx, postgres, and Statping-ng.

+ ```bash docker-compose up -d ``` -



-## Docker Compose with Automatic SSL -You can automatically start a Statping-ng server with automatic SSL encryption using this docker-compose file. First point your domain's DNS to the Statping-ng server, and then run this docker-compose command with DOMAIN and EMAIL. Email is for letsencrypt services. +

Docker Compose with Automatic SSL

+

You can automatically start a Statping-ng server with automatic SSL encryption using this docker-compose file. First point your domain's DNS to the Statping-ng server, and then run this docker-compose command with DOMAIN and EMAIL. Email is for letsencrypt services.

+ ```bash LETSENCRYPT_HOST=mydomain.com \ LETSENCRYPT_EMAIL=info@mydomain.com \ docker-compose -f docker-compose-ssl.yml up -d ``` -Once your instance has started, it will take a moment to get your SSL certificate. Make sure you have a A or CNAME record on your domain that points to the IP/DNS of your server running Statping-ng. -



-## Prometheus Exporter -Statping-ng includes a [Prometheus Exporter](https://github.com/statping-ng/statping-ng/wiki/Prometheus-Exporter) so you can have even more monitoring power with your services. The Prometheus exporter can be seen on `/metrics`, simply create another exporter in your prometheus config. Use your Statping-ng API Secret for the Authorization Bearer header, the `/metrics` URL is dedicated for Prometheus and requires the correct API Secret has `Authorization` header. +

Once your instance has started, it will take a moment to get your SSL certificate. Make sure you have a A or CNAME record on your domain that points to the IP/DNS of your server running Statping-ng.

+ +

Prometheus Exporter

+

Statping-ng includes a Prometheus Exporter so you can have even more monitoring power with your services. The Prometheus exporter can be seen on /metrics, simply create another exporter in your prometheus config. Use your Statping-ng API Secret for the Authorization Bearer header, the /metrics URL is dedicated for Prometheus and requires the correct API Secret has Authorization header.

+ ```yaml scrape_configs: - job_name: 'statping' @@ -114,9 +154,9 @@ scrape_configs: static_configs: - targets: ['statping:8080'] ``` -



-## Contributing -Statping-ng accepts Push Requests to the `dev` branch! Feel free to add your own features and notifiers. You probably want to checkout the [Notifier Wiki](https://github.com/statping-ng/statping-ng/wiki/Notifiers) to get a better understanding on how to create your own notification methods for failing/successful services. Testing on Statping-ng will test each function on MySQL, Postgres, and SQLite. I recommend running MySQL and Postgres Docker containers for testing. You can find multiple docker-compose files in the dev directory. - -[![Go Report Card](https://goreportcard.com/badge/github.com/statping-ng/statping-ng)](https://goreportcard.com/report/github.com/statping-ng/statping-ng) +

Contributing

+

Statping-ng accepts Push Requests to the dev branch!

+

Feel free to add your own features and notifiers.You probably want to checkout the Notifier Wiki to get a better understanding on how to create your own notification methods for failing/successful services.

+

Testing on Statping-ng will test each function on MySQL, Postgres, and SQLite. I recommend running MySQL and Postgres Docker containers for testing.

+

You can find multiple docker-compose files in the dev directory.

From 49efcaf10470176bdbb5c8094c4974e17ce289b9 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 10:30:58 +0100 Subject: [PATCH 14/55] Windows 32bit for unstable, Windows 32/64 and darwin 64 for stable. --- .github/workflows/2_unstable.yml | 2 + .github/workflows/3_stable.yml | 68 ++++++++++++++++---------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index c9a18933..71b9cad8 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -64,6 +64,8 @@ jobs: include: - platform: darwin arch: amd64 + - platform: windows + arch: 386 - platform: windows arch: amd64 diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml index 71fec2ad..3c5537c0 100644 --- a/.github/workflows/3_stable.yml +++ b/.github/workflows/3_stable.yml @@ -74,11 +74,13 @@ jobs: matrix: platform: [linux] arch: [386, amd64, arm-7, arm-6, arm64] -# include: -# - platform: darwin -# arch: amd64 -# - platform: windows -# arch: amd64 + include: + - platform: darwin + arch: amd64 + - platform: windows + arch: 386 + - platform: windows + arch: amd64 steps: - uses: actions/checkout@v2 @@ -108,17 +110,17 @@ jobs: echo "XGO_TAGS=netgo osusergo linux sqlite_omit_load_extension" >> $GITHUB_ENV shell: bash -# - name: Set Darwin Build Flags -# if: matrix.platform == 'darwin' -# run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV -# shell: bash + - name: Set Darwin Build Flags + if: matrix.platform == 'darwin' + run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV + shell: bash -# - name: Set Windows Build Flags -# if: matrix.platform == 'windows' -# run: | -# echo "BUILD_FLAGS=-extldflags -static" >> $GITHUB_ENV -# echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV -# shell: bash + - name: Set Windows Build Flags + if: matrix.platform == 'windows' + run: | + echo "BUILD_FLAGS=-extldflags -static -buildmode=exe" >> $GITHUB_ENV + echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV + shell: bash - name: Build ${{ matrix.platform }}/${{ matrix.arch }} uses: crazy-max/ghaction-xgo@v1 @@ -148,25 +150,25 @@ jobs: rm -rf statping echo "compressed=statping-linux-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV -# - name: Compress Windows Builds -# if: matrix.platform == 'windows' -# run: | -# cd build -# mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe -# chmod +x statping.exe -# zip statping-windows-${{ matrix.arch }}.zip statping.exe -# rm -rf statping.exe -# echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV + - name: Compress Windows Builds + if: matrix.platform == 'windows' + run: | + cd build + mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe + chmod +x statping.exe + zip statping-windows-${{ matrix.arch }}.zip statping.exe + rm -rf statping.exe + echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV -# - name: Compress Darwin Builds -# if: matrix.platform == 'darwin' -# run: | -# cd build -# mv statping-darwin-10.6-${{ matrix.arch }} statping -# chmod +x statping -# tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping -# rm -rf statping -# echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + - name: Compress Darwin Builds + if: matrix.platform == 'darwin' + run: | + cd build + mv statping-darwin-10.12-${{ matrix.arch }} statping + chmod +x statping + tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping + rm -rf statping + echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - name: Upload Compiled Statping Binary uses: actions/upload-artifact@v1 From 3bd621e0e3d35a46a993f928c1f6b707725fdf66 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 10:31:18 +0100 Subject: [PATCH 15/55] Test darwin 32bit on dev --- .github/workflows/1_dev.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 22282697..6d8f063e 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -63,9 +63,13 @@ jobs: arch: [386, amd64, arm-7, arm-6, arm64] include: - platform: darwin - arch: [386, amd64] + arch: 386 + - platform: darwin + arch: amd64 - platform: windows - arch: [386, amd64] + arch: 386 + - platform: windows + arch: amd64 steps: - uses: actions/checkout@v2 @@ -140,7 +144,15 @@ jobs: echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV - name: Compress Darwin ${{matrix.arch}} Builds - if: matrix.platform == 'darwin' + if: matrix.platform == 'darwin' and matrix.platform == '386' + run: | + cd build + mv statping-darwin-10.6-${{ matrix.arch }} statping + chmod +x statping + tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping + rm -rf statping + echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + if: matrix.platform == 'darwin' and matrix.platform == 'amd64' run: | cd build mv statping-darwin-10.12-${{ matrix.arch }} statping @@ -148,6 +160,14 @@ jobs: tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping rm -rf statping echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV +# if: matrix.platform == 'darwin' and matrix.platform == 'arm64' +# run: | +# cd build +# mv statping-darwin-10.15-${{ matrix.arch }} statping +# chmod +x statping +# tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping +# rm -rf statping +# echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV test: needs: frontend From a76ba0c4ed90c968d38fd71327437689ef37b08c Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 10:33:20 +0100 Subject: [PATCH 16/55] Fixed bad workflow logic. --- .github/workflows/1_dev.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 6d8f063e..aaf45c8e 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -133,7 +133,7 @@ jobs: rm -rf statping echo "compressed=statping-linux-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - - name: Compress Windows ${{matrix.arch}} Builds + - name: Compress Windows Builds if: matrix.platform == 'windows' run: | cd build @@ -143,7 +143,7 @@ jobs: rm -rf statping.exe echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV - - name: Compress Darwin ${{matrix.arch}} Builds + - name: Compress Darwin 32bit Builds if: matrix.platform == 'darwin' and matrix.platform == '386' run: | cd build @@ -152,6 +152,8 @@ jobs: tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping rm -rf statping echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + + - name: Compress Darwin 32bit Builds if: matrix.platform == 'darwin' and matrix.platform == 'amd64' run: | cd build @@ -160,6 +162,8 @@ jobs: tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping rm -rf statping echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + +# - name: Compress Darwin arm64 Builds # if: matrix.platform == 'darwin' and matrix.platform == 'arm64' # run: | # cd build From 6c5c5d1827a459f6b02965cfdb52df9d558a11f4 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 10:35:40 +0100 Subject: [PATCH 17/55] Fixed bad workflow logic on dev. --- .github/workflows/1_dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index aaf45c8e..3b7ff1e1 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -144,7 +144,7 @@ jobs: echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV - name: Compress Darwin 32bit Builds - if: matrix.platform == 'darwin' and matrix.platform == '386' + if: matrix.platform == 'darwin' && matrix.platform == '386' run: | cd build mv statping-darwin-10.6-${{ matrix.arch }} statping @@ -154,7 +154,7 @@ jobs: echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - name: Compress Darwin 32bit Builds - if: matrix.platform == 'darwin' and matrix.platform == 'amd64' + if: matrix.platform == 'darwin' && matrix.platform == 'amd64' run: | cd build mv statping-darwin-10.12-${{ matrix.arch }} statping @@ -164,7 +164,7 @@ jobs: echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV # - name: Compress Darwin arm64 Builds -# if: matrix.platform == 'darwin' and matrix.platform == 'arm64' +# if: matrix.platform == 'darwin' && matrix.platform == 'arm64' # run: | # cd build # mv statping-darwin-10.15-${{ matrix.arch }} statping From 0e4fc8542f9276fd3492bd3bbec175a723ff320a Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 10:36:44 +0100 Subject: [PATCH 18/55] Workflow for unstable now uses unstable branch. --- .github/workflows/2_unstable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index 71b9cad8..9e730edd 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -2,7 +2,7 @@ name: 2. Unstable Build, Test and Deploy on: push: branches: - - dev + - unstable paths-ignore: - '**.md' From a2139e91bcdaf0876c5f9dc4d3f1f003a961fd43 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 10:52:21 +0100 Subject: [PATCH 19/55] Try a fix for snaps. --- snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 0d4ec108..72fcb0be 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -36,4 +36,5 @@ parts: apt-get update apt-get install -y curl tar curl -o- -L https://raw.githubusercontent.com/statping-ng/statping-ng/stable/install.sh | bash - mv /usr/local/bin/statping ./ + cp /usr/local/bin/statping statping + cp /usr/local/bin/statping /build/statping-ng/prime/./statping From aa2fcc976b0bd76194c2848a1fdc08ec728b6ad3 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 10:53:08 +0100 Subject: [PATCH 20/55] Updates to statping install script, including a new quiet for curl. --- install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index ad6f7fc3..a7ae50a3 100755 --- a/install.sh +++ b/install.sh @@ -24,7 +24,7 @@ statping_get_tarball() { printf "$cyan> Downloading latest version for $OS $ARCH...\n$url $reset\n" # Get both the tarball and its GPG signature tarball_tmp=`mktemp -t statping.tar.gz.XXXXXXXXXX` - if curl --fail -L -o "$tarball_tmp" "$url"; then + if curl --fail -L -s -o "$tarball_tmp" "$url"; then # All this dance is because `tar --strip=1` does not work everywhere temp=$(mktemp -d statping.XXXXXXXXXX) if [ ${OS} == 'windows' ]; then @@ -32,11 +32,11 @@ statping_get_tarball() { else tar xzf $tarball_tmp -C "$temp" fi - printf "$green> Installing to $DEST/statping\n" + printf "$green> Installing to $DEST/statping-ng\n" mv "$temp"/statping "$DEST" rm -rf "$temp" rm $tarball_tmp* - printf "$cyan> Statping is now installed! $reset\n" + printf "$cyan> Statping-ng is now installed! $reset\n" printf "$white> Repo: $repo $reset\n" printf "$white> Wiki: $repo/wiki $reset\n" printf "$white> Issues: $repo/issues $reset\n" @@ -66,7 +66,7 @@ statping_brew_install() { } statping_install() { - printf "${white}Installing Statping!$reset\n" + printf "${white}Installing Statping-ng!$reset\n" getOS getArch statping_get_tarball $OS $ARCH From 01619c93c0721b86005b0aa65023242c015ae9e2 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 14:52:02 +0100 Subject: [PATCH 21/55] Darwin 32bit build test --- .github/workflows/1_dev.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 3b7ff1e1..764da660 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -144,7 +144,7 @@ jobs: echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV - name: Compress Darwin 32bit Builds - if: matrix.platform == 'darwin' && matrix.platform == '386' + if: matrix.platform == 'darwin' && matrix.arch == '386' run: | cd build mv statping-darwin-10.6-${{ matrix.arch }} statping @@ -153,8 +153,8 @@ jobs: rm -rf statping echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - - name: Compress Darwin 32bit Builds - if: matrix.platform == 'darwin' && matrix.platform == 'amd64' + - name: Compress Darwin 64bit Builds + if: matrix.platform == 'darwin' && matrix.arch == 'amd64' run: | cd build mv statping-darwin-10.12-${{ matrix.arch }} statping @@ -164,7 +164,7 @@ jobs: echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV # - name: Compress Darwin arm64 Builds -# if: matrix.platform == 'darwin' && matrix.platform == 'arm64' +# if: matrix.platform == 'darwin' && matrix.arch == 'arm64' # run: | # cd build # mv statping-darwin-10.15-${{ matrix.arch }} statping @@ -173,6 +173,12 @@ jobs: # rm -rf statping # echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + - name: Upload Compiled Statping Binary + uses: actions/upload-artifact@v1 + with: + name: statping-${{ matrix.platform }}-${{ matrix.arch }} + path: ./build + test: needs: frontend runs-on: ubuntu-latest From 694d3b94a1f64acd2071685293c3abbb3b4ccc3e Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 15:04:38 +0100 Subject: [PATCH 22/55] Darwin Build Test --- .github/workflows/1_dev.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 764da660..5386efc4 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -144,17 +144,7 @@ jobs: echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV - name: Compress Darwin 32bit Builds - if: matrix.platform == 'darwin' && matrix.arch == '386' - run: | - cd build - mv statping-darwin-10.6-${{ matrix.arch }} statping - chmod +x statping - tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping - rm -rf statping - echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - - - name: Compress Darwin 64bit Builds - if: matrix.platform == 'darwin' && matrix.arch == 'amd64' + if: matrix.platform == 'darwin' run: | cd build mv statping-darwin-10.12-${{ matrix.arch }} statping @@ -163,16 +153,6 @@ jobs: rm -rf statping echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV -# - name: Compress Darwin arm64 Builds -# if: matrix.platform == 'darwin' && matrix.arch == 'arm64' -# run: | -# cd build -# mv statping-darwin-10.15-${{ matrix.arch }} statping -# chmod +x statping -# tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping -# rm -rf statping -# echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - - name: Upload Compiled Statping Binary uses: actions/upload-artifact@v1 with: From 203b84c724598c65bf6f3fca33828add15ff7731 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 25 Aug 2021 15:21:46 +0100 Subject: [PATCH 23/55] Uplaod whatever darwin binary, this isnt for release --- .github/workflows/1_dev.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 5386efc4..cd11ccc9 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -144,7 +144,17 @@ jobs: echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV - name: Compress Darwin 32bit Builds - if: matrix.platform == 'darwin' + if: matrix.platform == 'darwin' && matrix.arch == '386' + run: | + cd build +# mv statping-darwin-10.6-${{ matrix.arch }} statping +# chmod +x statping + tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz * +# rm -rf statping + echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + + - name: Compress Darwin 64bit Builds + if: matrix.platform == 'darwin' && matrix.arch == 'amd64' run: | cd build mv statping-darwin-10.12-${{ matrix.arch }} statping @@ -153,6 +163,16 @@ jobs: rm -rf statping echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV +# - name: Compress Darwin arm64 Builds +# if: matrix.platform == 'darwin' && matrix.arch == 'arm64' +# run: | +# cd build +# mv statping-darwin-10.15-${{ matrix.arch }} statping +# chmod +x statping +# tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping +# rm -rf statping +# echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV + - name: Upload Compiled Statping Binary uses: actions/upload-artifact@v1 with: From 1f11e317817dad4addafb76bc132a503eb7c0b05 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 25 Aug 2021 18:55:23 +0100 Subject: [PATCH 24/55] Update 1_dev.yml --- .github/workflows/1_dev.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index cd11ccc9..bd650878 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -147,11 +147,12 @@ jobs: if: matrix.platform == 'darwin' && matrix.arch == '386' run: | cd build + ls >> $GITHUB_ENV # mv statping-darwin-10.6-${{ matrix.arch }} statping # chmod +x statping - tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz * +# tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz * # rm -rf statping - echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV +# echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV - name: Compress Darwin 64bit Builds if: matrix.platform == 'darwin' && matrix.arch == 'amd64' From 25a5aada2ce20acda59e90c16c75273d76af025a Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 28 Aug 2021 00:08:20 +0200 Subject: [PATCH 25/55] Dockerfile build local files not remote files --- Dockerfile | 55 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05c090ed..aa448ba7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,53 @@ -FROM adamboutcher/statping-ng:base AS base +FROM node:12.18.2-alpine AS frontend +LABEL maintainer="Statping-ng (https://github.com/statping-ng)" ARG BUILDPLATFORM -# Statping main Docker image that contains all required libraries -FROM alpine:latest +WORKDIR /statping +COPY ./frontend/package.json . +COPY ./frontend/yarn.lock . +RUN yarn install --pure-lockfile --network-timeout 1000000 +COPY ./frontend . +RUN yarn build && yarn cache clean + +# Statping Golang BACKEND building from source +# Creates "/go/bin/statping" and "/usr/local/bin/sass" for copying +FROM golang:1.14-alpine AS backend +LABEL maintainer="Statping-NG (https://github.com/statping-ng)" +ARG VERSION +ARG COMMIT +ARG BUILDPLATFORM +ARG TARGETARCH +RUN apk add --update --no-cache libstdc++ gcc g++ make git autoconf \ + libtool ca-certificates linux-headers wget curl jq && \ + update-ca-certificates + +WORKDIR /root +RUN git clone https://github.com/sass/sassc.git +RUN . sassc/script/bootstrap && make -C sassc -j4 +# sassc binary: /root/sassc/bin/sassc + +WORKDIR /go/src/github.com/statping-ng/statping-ng +ADD go.mod go.sum ./ +RUN go mod download +ENV GO111MODULE on +ENV CGO_ENABLED 1 +RUN go get github.com/stretchr/testify/assert && \ + go get github.com/stretchr/testify/require && \ + go get github.com/GeertJohan/go.rice/rice && \ + go get github.com/cortesi/modd/cmd/modd && \ + go get github.com/crazy-max/xgo +COPY . . +COPY --from=frontend /statping/dist/ ./source/dist/ +RUN make clean generate embed +RUN go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" -o statping --tags "netgo linux" ./cmd +RUN chmod a+x statping && mv statping /go/bin/statping +# /go/bin/statping - statping binary +# /root/sassc/bin/sassc - sass binary +# /statping - Vue frontend (from frontend) + RUN apk --no-cache add libgcc libstdc++ ca-certificates curl jq && update-ca-certificates -COPY --from=base /go/bin/statping /usr/local/bin/ -COPY --from=base /root/sassc/bin/sassc /usr/local/bin/ -COPY --from=base /usr/local/share/ca-certificates /usr/local/share/ +RUN cp /go/bin/statping /usr/local/bin/ +RUN cp /root/sassc/bin/sassc /usr/local/bin/ WORKDIR /app VOLUME /app @@ -20,4 +61,4 @@ EXPOSE $PORT HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD curl -s "http://localhost:$PORT/health" | jq -r -e ".online==true" -CMD statping --port $PORT +CMD statping --port $PORT \ No newline at end of file From 6a0250b0ea7fc64d017b8f9338e3b29fd523618f Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 28 Aug 2021 00:18:56 +0200 Subject: [PATCH 26/55] reduce size of Image --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa448ba7..3f7b4407 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,10 +44,12 @@ RUN chmod a+x statping && mv statping /go/bin/statping # /root/sassc/bin/sassc - sass binary # /statping - Vue frontend (from frontend) +FROM alpine:latest + RUN apk --no-cache add libgcc libstdc++ ca-certificates curl jq && update-ca-certificates -RUN cp /go/bin/statping /usr/local/bin/ -RUN cp /root/sassc/bin/sassc /usr/local/bin/ +COPY --from=backend /go/bin/statping /usr/local/bin/ +COPY --from=backend /root/sassc/bin/sassc /usr/local/bin/ WORKDIR /app VOLUME /app From e36323c2476ba12e5d9efe444b613f5f261d437b Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 28 Aug 2021 00:47:35 +0200 Subject: [PATCH 27/55] remove base-image --- Makefile | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index c701900f..e3af0ecc 100644 --- a/Makefile +++ b/Makefile @@ -111,13 +111,10 @@ db-down: console: docker exec -t -i statping /bin/sh -compose-build-full: docker-base +compose-build-full: docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml build --parallel --build-arg VERSION=${VERSION} -docker-base: - docker build -t statping-ng/statping-ng:base -f Dockerfile.base --build-arg VERSION=${VERSION} . - -docker-latest: docker-base +docker-latest: docker build -t statping-ng/statping-ng:latest --build-arg VERSION=${VERSION} . docker-vue: @@ -126,13 +123,6 @@ docker-vue: docker-test: docker-compose -f docker-compose.test.yml up --remove-orphans -push-base: clean compile docker-base - docker push statping-ng/statping-ng:base - -push-vue: clean compile docker-base docker-vue - docker push statping-ng/statping-ng:base - docker push statping-ng/statping-ng:vue - modd: modd -f ./dev/modd.conf @@ -285,16 +275,9 @@ download-key: wget -O statping.gpg $(SIGN_URL) gpg --import statping.gpg -# push the :dev docker tag using curl -dockerhub-dev: - docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:dev --no-cache -f Dockerfile.base . - docker push statping-ng/statping-ng:dev - dockerhub: - docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:base --no-cache -f Dockerfile.base . docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:latest --no-cache -f Dockerfile . docker tag statping-ng/statping-ng statping-ng/statping-ng:v${VERSION} - docker push statping-ng/statping-ng:base docker push statping-ng/statping-ng:v${VERSION} docker push statping-ng/statping-ng @@ -392,12 +375,6 @@ buildx-dev: multiarch docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache,mode=max" --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t adamboutcher/statping-ng:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . docker buildx rm statping-dev -buildx-base: multiarch - docker buildx create --name statping-base --driver-opt image=moby/buildkit:master - docker buildx inspect --builder statping-base --bootstrap - docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache,mode=max" --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t adamboutcher/statping-ng:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . - docker buildx rm statping-base - multiarch: mkdir /tmp/.buildx-cache || true docker run --rm --privileged multiarch/qemu-user-static --reset -p yes @@ -426,5 +403,5 @@ gen_help: marked -o html/$file.html $file --gfm done -.PHONY: all check build certs multiarch install-darwin go-build build-all buildx-base buildx-dev buildx-latest build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman +.PHONY: all check build certs multiarch install-darwin go-build build-all buildx-dev buildx-latest build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman .SILENT: travis_s3_creds From ccbf9baaf03de4a9213dd9e43c3d68dc8cbf409f Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 28 Aug 2021 00:48:22 +0200 Subject: [PATCH 28/55] adjust image names to be statping-ng/statping-ng --- dev/docker-compose.lite.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/docker-compose.lite.yml b/dev/docker-compose.lite.yml index 78f7dd2d..66b9c85e 100644 --- a/dev/docker-compose.lite.yml +++ b/dev/docker-compose.lite.yml @@ -4,7 +4,7 @@ services: statping_dev: container_name: statping_dev - image: statping/statping:dev + image: statping-ng/statping-ng:dev restart: on-failure volumes: - ./cmd:/go/src/github.com/statping-ng/statping-ng/cmd/ diff --git a/docker-compose.yml b/docker-compose.yml index 38533e5a..c5f45948 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2.3' services: statping: container_name: statping - image: aboutcher/statping-ng:dev + image: statping-ng/statping-ng:dev restart: always volumes: - statping_data:/app From e5c7c4541d2099824882e3f86540071b7d1adfec Mon Sep 17 00:00:00 2001 From: nils1323 Date: Sat, 28 Aug 2021 02:00:50 +0200 Subject: [PATCH 29/55] add description for Image with binary Co-authored-by: Willy --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3f7b4407..fbe6d76b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,7 @@ RUN chmod a+x statping && mv statping /go/bin/statping # /root/sassc/bin/sassc - sass binary # /statping - Vue frontend (from frontend) +# Statping main Docker image that contains all required libraries FROM alpine:latest RUN apk --no-cache add libgcc libstdc++ ca-certificates curl jq && update-ca-certificates From 9327dbbf52c2f0692b88319dab9ee46b44e38bd1 Mon Sep 17 00:00:00 2001 From: nils1323 Date: Sat, 28 Aug 2021 02:10:54 +0200 Subject: [PATCH 30/55] Apply suggestions from code review Co-authored-by: Willy --- Dockerfile | 3 ++- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fbe6d76b..ca503f78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,7 @@ RUN apk --no-cache add libgcc libstdc++ ca-certificates curl jq && update-ca-cer COPY --from=backend /go/bin/statping /usr/local/bin/ COPY --from=backend /root/sassc/bin/sassc /usr/local/bin/ +COPY --from=backend /usr/local/share/ca-certificates /usr/local/share/ WORKDIR /app VOLUME /app @@ -64,4 +65,4 @@ EXPOSE $PORT HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD curl -s "http://localhost:$PORT/health" | jq -r -e ".online==true" -CMD statping --port $PORT \ No newline at end of file +CMD statping --port $PORT diff --git a/docker-compose.yml b/docker-compose.yml index c5f45948..38533e5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2.3' services: statping: container_name: statping - image: statping-ng/statping-ng:dev + image: aboutcher/statping-ng:dev restart: always volumes: - statping_data:/app From ad416c9499b4f6ed64f53927da9cb3762c3eb46b Mon Sep 17 00:00:00 2001 From: nils1323 Date: Sat, 28 Aug 2021 02:13:22 +0200 Subject: [PATCH 31/55] remove docker-vue --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index e3af0ecc..5d484547 100644 --- a/Makefile +++ b/Makefile @@ -117,9 +117,6 @@ compose-build-full: docker-latest: docker build -t statping-ng/statping-ng:latest --build-arg VERSION=${VERSION} . -docker-vue: - docker build -t statping-ng/statping-ng:vue --build-arg VERSION=${VERSION} . - docker-test: docker-compose -f docker-compose.test.yml up --remove-orphans From a222b0148a00ebe8b69dc30fb0b94e90ad9310ea Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 28 Aug 2021 20:42:12 +0200 Subject: [PATCH 32/55] fixed naming for dockerhub --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5d484547..04ae8c6f 100644 --- a/Makefile +++ b/Makefile @@ -273,10 +273,10 @@ download-key: gpg --import statping.gpg dockerhub: - docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:latest --no-cache -f Dockerfile . - docker tag statping-ng/statping-ng statping-ng/statping-ng:v${VERSION} - docker push statping-ng/statping-ng:v${VERSION} - docker push statping-ng/statping-ng + docker build --build-arg VERSION=${VERSION} -t adamboutcher/statping-ng:latest --no-cache -f Dockerfile . + docker tag adamboutcher/statping-ng adamboutcher/statping-ng:v${VERSION} + docker push adamboutcher/statping-ng:v${VERSION} + docker push adamboutcher/statping-ng docker-build-dev: docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:latest --no-cache -f Dockerfile . From 57e594823a7ace7a74540bdbb013a769fa23173a Mon Sep 17 00:00:00 2001 From: Nils Date: Sat, 28 Aug 2021 20:50:11 +0200 Subject: [PATCH 33/55] fix naming in docker-compose --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 38533e5a..395b773e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2.3' services: statping: container_name: statping - image: aboutcher/statping-ng:dev + image: adamboutcher/statping-ng:latest restart: always volumes: - statping_data:/app From 1504265fb15458c0c15192b11abb01634a676bbc Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 3 Sep 2021 19:22:28 +0100 Subject: [PATCH 34/55] Tweaks to make Snapcrafts Build --- snapcraft.yaml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 72fcb0be..781fdd86 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,28 +1,31 @@ name: statping-ng -version-script: cat version.txt version: "stable" +version-script: cat version.txt summary: Statping-ng Server Monitoring with Status Page -description: > +description: | An easy to use Status Page for your websites and applications. Statping will automatically fetch the application and render a beautiful status page with tons of features for you to build an even better status page. This Status Page generator allows you to use MySQL, Postgres, or SQLite on multiple operating systems. -base: base + +base: bare +build-base: core18 type: app confinement: strict grade: stable -issues: https://github.com/statping-ng/statping-ng/issues +license: GPL-3.0 architectures: + - build-on: i386 - build-on: amd64 - build-on: armhf - build-on: arm64 - - build-on: i386 apps: statping: - command: statping + command: bin/statping + daemon: simple plugs: - home - network @@ -33,8 +36,10 @@ parts: source: . plugin: nil override-build: | - apt-get update - apt-get install -y curl tar - curl -o- -L https://raw.githubusercontent.com/statping-ng/statping-ng/stable/install.sh | bash - cp /usr/local/bin/statping statping - cp /usr/local/bin/statping /build/statping-ng/prime/./statping + curl -o- -L https://raw.githubusercontent.com/adamboutcher/statping-ng/dev/install.sh | bash + build-packages: + - tar + - curl + - bash + organize: + /usr/local/bin/statping: bin/ From 66df2f116afdcde4522ba50bf37c3cc02b2ec569 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 3 Sep 2021 19:35:23 +0100 Subject: [PATCH 35/55] Remove snapcraft as a statping service --- snapcraft.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 781fdd86..4afea18f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -25,7 +25,6 @@ architectures: apps: statping: command: bin/statping - daemon: simple plugs: - home - network From dedfbaca9d2ccfdfc07fc38ddde79d97204267ad Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Fri, 3 Sep 2021 20:15:15 +0100 Subject: [PATCH 36/55] Snap now a service and works correctly --- snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 4afea18f..96ae07fc 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,7 +9,7 @@ description: | This Status Page generator allows you to use MySQL, Postgres, or SQLite on multiple operating systems. -base: bare +base: core18 build-base: core18 type: app confinement: strict @@ -25,6 +25,7 @@ architectures: apps: statping: command: bin/statping + daemon: simple plugs: - home - network From 0bd42f3eaeb9484c552e7fab732e5aedaeb4e934 Mon Sep 17 00:00:00 2001 From: Florian Feldmann Date: Sun, 5 Sep 2021 03:20:17 +0200 Subject: [PATCH 37/55] Update german language --- frontend/src/languages/german.js | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/frontend/src/languages/german.js b/frontend/src/languages/german.js index e9f80593..362d37a4 100644 --- a/frontend/src/languages/german.js +++ b/frontend/src/languages/german.js @@ -1,8 +1,8 @@ const german = { settings: "Einstellungen", - dashboard: "Armaturenbrett", - services: "Dienstleistungen", - service: "Service", + dashboard: "Dashboard", + services: "Dienste", + service: "Dienst", failures: "Ausfälle", users: "Benutzer", login: "Login", @@ -20,43 +20,43 @@ const german = { close: "Schließen", secret: "Geheimnis", regen_api: "API-Schlüssel neu generieren", - regen_desc: "API Secret wird für Lesen erstellen Update und Löschen Routen verwendet. Sie können API-Schlüssel bei Bedarf neu generieren.", + regen_desc: "Der API-Schlüssel wird für das Lesen, Erstellen, Updaten und Löschen von Routen verwendet. Sie können API-Schlüssel bei Bedarf neu generieren.", visibility: "Sichtbarkeit", group: "Gruppe", group_create: "Gruppe erstellen", group_update: "Gruppe aktualisieren", - group_public_desc: "Gruppendienste für die Öffentlichkeit anzeigen", + group_public_desc: "Gruppendienste öffentlich anzeigen", groups: "Gruppen", no_group: "Keine Gruppe", - public: "Öffentlichkeit", + public: "Öffentlich", private: "Privat", announcements: "Ankündigungen", - notifiers: "Notifizierer", + notifiers: "Benachrichtigungen", logs: "Protokolle", - help: "Helfen", + help: "Hilfe", type: "Typ", edit: "Bearbeiten", update: "Update", - create: "Schaffen", - view: "Ansicht", - save: "sparen", + create: "Erstellen", + view: "Anzeigen", + save: "Speichern", title: "Titel", status: "Status", begins: "Beginnt", - total_services: "Dienstleistungen insgesamt", + total_services: "Dienste insgesamt", online_services: "Online-Dienste", - request_timeout: "Zeitüberschreitung anfordern", - service_never_online: "Service war noch nie online", + request_timeout: "Zeitüberschreitung bei Anforderung", + service_never_online: "Dienst war noch nie online", service_online_check: "Online geprüft", service_offline_time: "Dienst war offline für", - days_ago: "Vor Tagen", + days_ago: "Tage vergangen", today: "Heute", week: "Woche", month: "Monat", day: "Tag", hour: "Stunde", minute: "Minute", - failures_24_hours: "Ausfälle dauern 24 Stunden", + failures_24_hours: "Ausfälle letzte 24 Stunden", no_services: "Sie haben derzeit keine Dienste!", theme: "Thema", cache: "Cache", @@ -66,8 +66,8 @@ const german = { variables: "Variablen", docs: "Dokumentation", links: "Links", - changelog: "Protokoll ändern", - repo: "Depot", + changelog: "Änderungsprotokoll", + repo: "Repo", language: "Sprache", db_connection: "Datenbankverbindung", db_host: "Datenbank-Host", @@ -77,7 +77,7 @@ const german = { db_database: "Name der Datenbank", send_reports: "Fehlerberichte senden", send_reports_desc: "Fehler zum Debuggen an Statping senden", - project_name: "Name der Seite „Status“", + project_name: "Name der Statusseite", description: "Beschreibung", domain: "Domäne", enable_cdn: "CDN aktivieren", @@ -95,7 +95,7 @@ const german = { wrong_login: "Falscher Benutzername oder Passwort", theme_editor: "Theme-Editor", enable_assets: "Lokale Assets aktivieren", - assets_desc: "Passen Sie das Design Ihrer Statusseite an, indem Sie lokale Elemente aktivieren. Dadurch wird ein Verzeichnis „Assets“ erstellt, das alle CSS enthält.", + assets_desc: "Passen Sie das Design Ihrer Statusseite an, indem Sie lokale Assets aktivieren. Dadurch wird ein Verzeichnis „Assets“ erstellt, das das gesamte CSS enthält.", assets_btn: "Lokale Assets aktivieren", assets_loading: "Erstellen von Assets", assets_dir: "Assets Verzeichnis", @@ -106,7 +106,7 @@ const german = { notify_users: "Benutzer benachrichtigen", notify_desc: "Benutzer vor geplanter Zeit benachrichtigen", notify_method: "Benachrichtigungsmethode", - notify_before: "Vor benachrichtigen", + notify_before: "Benachrichtigen vor", message_create: "Ankündigung erstellen", message_edit: "Ankündigung bearbeiten", minutes: "Protokoll", @@ -117,15 +117,15 @@ const german = { administrator: "Administrator", checkins: "Checkins", incidents: "Vorfälle", - service_info: "Service-Info", + service_info: "Dienstinfo", service_name: "Dienstname", - service_type: "Service-Art", + service_type: "Dienstart", permalink: "Permalink-URL", service_public: "Öffentlicher Dienst", check_interval: "Intervall prüfen", - service_endpoint: "Service-Endpunkt", - service_check: "Service-Prüfungstyp", - service_timeout: "Zeitüberschreitung anfordern", + service_endpoint: "Dienst-Endpunkt", + service_check: "Dienst-Prüfungstyp", + service_timeout: "Dienst Zeitüberschreitung", expected_resp: "Erwartete Antwort", expected_code: "Erwarteter Statuscode", follow_redir: "Weiterleitungen folgen", @@ -134,9 +134,9 @@ const german = { notification_opts: "Benachrichtigungsoptionen", notifications_enable: "Benachrichtigungen aktivieren", notify_after: "Benachrichtigung nach Fehlern", - notify_all: "Alle Änderungen benachrichtigen", + notify_all: "Benachrichtigung nach allen Änderungen", service_update: "Dienst aktualisieren", service_create: "Dienst erstellen" } -export default german \ No newline at end of file +export default german From c250ad73a38cb5bdf247e723125a02a8c66c8de5 Mon Sep 17 00:00:00 2001 From: Fjuro Date: Sun, 5 Sep 2021 18:08:45 +0200 Subject: [PATCH 38/55] Add Czech language --- frontend/src/languages/czech.js | 142 ++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 frontend/src/languages/czech.js diff --git a/frontend/src/languages/czech.js b/frontend/src/languages/czech.js new file mode 100644 index 00000000..c29276d2 --- /dev/null +++ b/frontend/src/languages/czech.js @@ -0,0 +1,142 @@ +const czech = { + settings: "Nastavení", + dashboard: "Nástěnka", + services: "Služby", + service: "Služba", + failures: "Selhání", + users: "Uživatelé", + login: "Přihlásit se", + logout: "Odhlásit se", + online: "Online", + offline: "Offline", + configs: "Konfigurace", + username: "Uživatelské jméno", + password: "Heslo", + email: "E-mail", + confirm_password: "Potvrzení hesla", + uptime: "Doba provozu", + name: "Název", + copy: "Zkopírovat", + close: "Zavřít", + secret: "Tajný klíč", + regen_api: "Znovu vygenerovat API klíče", + regen_desc: "Tajný API klíč se používá ke trasám read, create, update a delete. Pokud potřebujete, můžete znovu vygenerovat vaše API klíče.", + visibility: "Viditelnost", + group: "Skupina", + group_create: "Vytvořit skupinu", + group_update: "Aktualizovat skupinu", + group_public_desc: "Zobrazit skupiny veřejně", + groups: "Skupiny", + no_group: "Žádná skupina", + public: "Veřejné", + private: "Soukromé", + announcements: "Oznámení", + notifiers: "Oznamovače", + logs: "Protokol", + help: "Podpora", + type: "Typ", + edit: "Upravit", + update: "Aktualizovat", + create: "Vytvořot", + view: "Zobrazit", + save: "Uložit", + title: "Název", + status: "Stav", + begins: "Začíná", + total_services: "Celkový počet služeb", + online_services: "Online služby", + request_timeout: "Časový limit požadavku vypršel", + service_never_online: "Služba nikdy nebyla online", + service_online_check: "Online zkontrolováno", + service_offline_time: "Služba je offline", + days_ago: "dny", + today: "Dnes", + week: "Týden", + month: "Měsíc", + day: "Den", + hour: "Hodina", + minute: "Minuta", + failures_24_hours: "Selhání v posledních 24 hodinách", + no_services: "Momentálně nemáte žádné služby!", + theme: "Téma", + cache: "Cache", + authentication: "Autentifikace", + import: "Importovat", + main_settings: "Obecná nastavení", + variables: "Proměnné", + docs: "Dokumentace", + links: "Odkazy", + changelog: "Seznam změn", + repo: "Repozitář", + language: "Jazyk", + db_connection: "Spojení s databází", + db_host: "Host databáze", + db_port: "Database Port", + db_username: "Uživatelské jméno databáze", + db_password: "Heslo databáze", + db_database: "Název databáze", + send_reports: "Posílat hlášení o chybách", + send_reports_desc: "Posílat hlášení o chybách Statpingu pro ladění", + project_name: "Název stavové stránky", + description: "Popis", + domain: "Doména", + enable_cdn: "Povolit CDN", + newsletter: "Newsletter", + newsletter_note: "Budeme vám posílat e-maily pouze s velkými změnami", + loading: "Načítání", + save_settings: "Uložit nastavení", + average_response: "Průměrná odpověď", + last_uptime: "Poslední doba provozu", + sign_in: "Přihlásit se", + last_login: "Poslední přihlášení", + admin: "Správce", + user: "Uživatel", + failed: "Selhání", + wrong_login: "Nesprávné uživatelské jméno nebo heslo", + theme_editor: "Editor témat", + enable_assets: "Povolit lokální assety", + assets_desc: "Přizpůsobte si vaši stavovou stránku povolením lokálních assetů. Vytvoříme adresář s názvem 'assets' obsahující všechno CSS.", + assets_btn: "Povolit lokální assety", + assets_loading: "Vytváření assetů", + assets_dir: "Adresář assetů", + footer: "Zápatí", + footer_notes: "V zápatí můžete používat HTML značky", + global_announcement: "Globální oznámení", + announcement_date: "Rozsah data oznámení", + notify_users: "Oznámit uživatelům", + notify_desc: "Oznámit uživatelům před naplánovanou dobou", + notify_method: "Metoda oznámení", + notify_before: "Oznámit před", + message_create: "Vytvořit oznámení", + message_edit: "Upravit oznámení", + minutes: "Minut", + hours: "Hodin", + days: "Dnů", + user_create: "Vytvořit uživatele", + user_update: "Aktualizovat uživatele", + administrator: "Správce", + checkins: "Kontroly", + incidents: "Incidenty", + service_info: "Informace o službě", + service_name: "Název služby", + service_type: "Typ služby", + permalink: "Pevná URL", + service_public: "Veřejná služba", + check_interval: "Interval kontroly", + service_endpoint: "Koncový bod služby", + service_check: "Typ kontroly služby", + service_timeout: "Vypršení času", + expected_resp: "Očekávaná odpověď", + expected_code: "Očekávaný stavový kód", + follow_redir: "Následovaná přesměrování", + verify_ssl: "Ověřit SSL", + tls_cert: "Použít TLS certifikát", + notification_opts: "Možnosti oznámení", + notifications_enable: "Povolit oznámení", + notify_after: "Oznámit po selháních", + notify_all: "Oznamovat vše", + service_update: "Aktualizovat službu", + service_create: "Vytvořit službu" +} + +export default czech From eb5589eeaf22e1e6d6adee6497ff9356eb0871af Mon Sep 17 00:00:00 2001 From: Nils Date: Sun, 5 Sep 2021 20:09:30 +0200 Subject: [PATCH 39/55] allow numeric input when using telegram --- frontend/src/forms/Notifier.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/forms/Notifier.vue b/frontend/src/forms/Notifier.vue index ebbf0ff3..4eb7538d 100644 --- a/frontend/src/forms/Notifier.vue +++ b/frontend/src/forms/Notifier.vue @@ -282,7 +282,7 @@ export default { this.notifier.form.forEach((f) => { let field = f.field.toLowerCase() let val = this.notifier[field] - if (this.isNumeric(val)) { + if (this.isNumeric(val) && (this.form.method!='telegram' && field != 'var1')) { val = parseInt(val) } this.form[field] = val @@ -304,7 +304,7 @@ export default { this.notifier.form.forEach((f) => { let field = f.field.toLowerCase() let val = this.notifier[field] - if (this.isNumeric(val)) { + if (this.isNumeric(val) && (this.form.method!='telegram' && field != 'var1')) { val = parseInt(val) } this.form[field] = val From 5a0639a14ea2c9be062a25280fa2a0588db0830d Mon Sep 17 00:00:00 2001 From: Nils Date: Sun, 5 Sep 2021 20:36:15 +0200 Subject: [PATCH 40/55] adjust info text --- notifiers/telegram.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notifiers/telegram.go b/notifiers/telegram.go index e5c87676..ee2558dc 100644 --- a/notifiers/telegram.go +++ b/notifiers/telegram.go @@ -52,8 +52,8 @@ var Telegram = &telegram{¬ifications.Notification{ }, { Type: "text", Title: "Channel", - Placeholder: "@statping_channel", - SmallText: "Insert your Telegram Channel including the @ symbol. The bot will need to be an administrator of this channel.", + Placeholder: "@statping_channel/-123123512312", + SmallText: "Insert your Telegram Channel including the @ symbol. The bot will need to be an administrator of this channel. You can also supply a chat_id.", DbField: "var1", Required: true, }}}, From e764f639d0b015c9e059e18d915f2a4f43161288 Mon Sep 17 00:00:00 2001 From: nils1323 Date: Mon, 6 Sep 2021 17:37:43 +0200 Subject: [PATCH 41/55] Fix logic check if it is var1 is not necessary because telegram only needs strings and no numbers --- frontend/src/forms/Notifier.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/forms/Notifier.vue b/frontend/src/forms/Notifier.vue index 4eb7538d..1e5c8ef5 100644 --- a/frontend/src/forms/Notifier.vue +++ b/frontend/src/forms/Notifier.vue @@ -282,7 +282,7 @@ export default { this.notifier.form.forEach((f) => { let field = f.field.toLowerCase() let val = this.notifier[field] - if (this.isNumeric(val) && (this.form.method!='telegram' && field != 'var1')) { + if (this.isNumeric(val) && this.form.method!='telegram') { val = parseInt(val) } this.form[field] = val @@ -304,7 +304,7 @@ export default { this.notifier.form.forEach((f) => { let field = f.field.toLowerCase() let val = this.notifier[field] - if (this.isNumeric(val) && (this.form.method!='telegram' && field != 'var1')) { + if (this.isNumeric(val) && this.form.method!='telegram') { val = parseInt(val) } this.form[field] = val From 819c0bf3752c94db36d2b310e5620dd447db066f Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Sat, 11 Sep 2021 21:04:10 +0100 Subject: [PATCH 42/55] Moved reliance on assets.statping.com to our github site. --- frontend/public/base.gohtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/public/base.gohtml b/frontend/public/base.gohtml index 696d733f..3cae161e 100644 --- a/frontend/public/base.gohtml +++ b/frontend/public/base.gohtml @@ -25,7 +25,7 @@ {{if USE_CDN}} - + {{else}} <% _.each(htmlWebpackPlugin.tags.headTags, function(headTag) { %> <%= headTag %> <% }) %> @@ -39,10 +39,10 @@
{{if USE_CDN}} - - - - + + + + {{else}} <% _.each(htmlWebpackPlugin.tags.bodyTags, function(bodyTag) { %> <%= bodyTag %> <% }) %> From 6aa229c0aafe61798fd611166fada641dc009a1f Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Sat, 11 Sep 2021 21:04:33 +0100 Subject: [PATCH 43/55] Branding changes --- frontend/src/components/Dashboard/TopNav.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Dashboard/TopNav.vue b/frontend/src/components/Dashboard/TopNav.vue index 8136fff8..c8692de6 100644 --- a/frontend/src/components/Dashboard/TopNav.vue +++ b/frontend/src/components/Dashboard/TopNav.vue @@ -1,6 +1,6 @@