Stop using CDNs + Remove bootstrap.min.js because it wasn't necessary

+ Gzip http.FileServer
Update Docker instructions
2020-09-06 00:55:01 -04:00 · 2020-09-06 00:27:26 -04:00 · 2020-09-05 00:01:12 -04:00
8 changed files with 107 additions and 21 deletions
--- a/README.md
+++ b/README.md
@@ -123,16 +123,8 @@ Here are some examples of conditions you can use:

 ## Docker

-Building the Docker image is done as follows:
-
 ```
-docker build . -t gatus
-```
-
-You can then run the container with the following command:
-
-```
-docker run -p 8080:8080 --name gatus gatus
+docker run -p 8080:8080 --name gatus twinproduction/gatus
 ```


--- a/core/alerting_test.go
+++ b/core/alerting_test.go
@@ -0,0 +1,48 @@
+package core
+
+import (
+	"io/ioutil"
+	"testing"
+)
+
+func TestCustomAlertProvider_buildRequestWhenResolved(t *testing.T) {
+	const (
+		ExpectedUrl  = "http://example.com/service-name"
+		ExpectedBody = "service-name,alert-description,RESOLVED"
+	)
+	customAlertProvider := &CustomAlertProvider{
+		Url:     "http://example.com/[SERVICE_NAME]",
+		Method:  "GET",
+		Body:    "[SERVICE_NAME],[ALERT_DESCRIPTION],[ALERT_TRIGGERED_OR_RESOLVED]",
+		Headers: nil,
+	}
+	request := customAlertProvider.buildRequest("service-name", "alert-description", true)
+	if request.URL.String() != ExpectedUrl {
+		t.Error("expected URL to be", ExpectedUrl, "was", request.URL.String())
+	}
+	body, _ := ioutil.ReadAll(request.Body)
+	if string(body) != ExpectedBody {
+		t.Error("expected body to be", ExpectedBody, "was", string(body))
+	}
+}
+
+func TestCustomAlertProvider_buildRequestWhenTriggered(t *testing.T) {
+	const (
+		ExpectedUrl  = "http://example.com/service-name"
+		ExpectedBody = "service-name,alert-description,TRIGGERED"
+	)
+	customAlertProvider := &CustomAlertProvider{
+		Url:     "http://example.com/[SERVICE_NAME]",
+		Method:  "GET",
+		Body:    "[SERVICE_NAME],[ALERT_DESCRIPTION],[ALERT_TRIGGERED_OR_RESOLVED]",
+		Headers: nil,
+	}
+	request := customAlertProvider.buildRequest("service-name", "alert-description", false)
+	if request.URL.String() != ExpectedUrl {
+		t.Error("expected URL to be", ExpectedUrl, "was", request.URL.String())
+	}
+	body, _ := ioutil.ReadAll(request.Body)
+	if string(body) != ExpectedBody {
+		t.Error("expected body to be", ExpectedBody, "was", string(body))
+	}
+}
--- a/gzip.go
+++ b/gzip.go
@@ -0,0 +1,46 @@
+package main
+
+import (
+	"compress/gzip"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"sync"
+)
+
+var gzPool = sync.Pool{
+	New: func() interface{} {
+		return gzip.NewWriter(ioutil.Discard)
+	},
+}
+
+type gzipResponseWriter struct {
+	io.Writer
+	http.ResponseWriter
+}
+
+func (w *gzipResponseWriter) WriteHeader(status int) {
+	w.Header().Del("Content-Length")
+	w.ResponseWriter.WriteHeader(status)
+}
+
+func (w *gzipResponseWriter) Write(b []byte) (int, error) {
+	return w.Writer.Write(b)
+}
+
+func GzipHandler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(writer http.ResponseWriter, r *http.Request) {
+		// If the request doesn't specify that it supports gzip, then don't compress it
+		if !strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
+			next.ServeHTTP(writer, r)
+			return
+		}
+		writer.Header().Set("Content-Encoding", "gzip")
+		gz := gzPool.Get().(*gzip.Writer)
+		defer gzPool.Put(gz)
+		gz.Reset(writer)
+		defer gz.Close()
+		next.ServeHTTP(&gzipResponseWriter{ResponseWriter: writer, Writer: gz}, r)
+	})
+}
--- a/main.go
+++ b/main.go
@@ -25,7 +25,7 @@ func main() {
 	cfg := loadConfiguration()
 	http.HandleFunc("/api/v1/results", serviceResultsHandler)
 	http.HandleFunc("/health", healthHandler)
-	http.Handle("/", http.FileServer(http.Dir("./static")))
+	http.Handle("/", GzipHandler(http.FileServer(http.Dir("./static"))))
 	if cfg.Metrics {
 		http.Handle("/metrics", promhttp.Handler())
 	}
--- a/static/bootstrap.min.css
+++ b/static/bootstrap.min.css
--- a/static/index.html
+++ b/static/index.html
@@ -3,7 +3,7 @@
 <head>
 	<title>Health Dashboard</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+	<link rel="stylesheet" href="/bootstrap.min.css" />
 	<style>
 		html, body {
 			background-color: #f7f9fb;
@@ -22,13 +22,6 @@
 			border-color: #dee2e6;
 			border-style: solid;
 		}
-		.status-ok {
-			display: inline-block;
-			width: 1%;
-			height: 20px;
-			margin-right: 4px;
-			background-color: #28a745;
-		}
 		.status {
 			cursor: pointer;
 			transition: all 500ms ease-in-out;
@@ -93,7 +86,7 @@
 					<div class="title display-4">Health Status</div>
 				</div>
 				<div class="col-4 text-right">
-					<img src="logo.png" alt="GaTuS" style="position: relative; min-width: 50px; max-width: 200px; width: 20%;"/>
+					<img src="logo.png" alt="Gatus" style="position: relative; min-width: 50px; max-width: 200px; width: 20%;"/>
 				</div>
 			</div>
 		</div>
@@ -113,8 +106,7 @@
 		</div>
 	</div>

-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-	<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	<script src="/jquery.min.js"></script>

 	<script>
 		let serviceStatuses = {};
--- a/static/jquery.min.js
+++ b/static/jquery.min.js
--- a/static/logo-candidate.png
+++ b/static/logo-candidate.png
Author	SHA1	Message	Date
TwinProduction	e31c017a00	Stop using CDNs + Remove bootstrap.min.js because it wasn't necessary + Gzip http.FileServer	2020-09-06 00:55:01 -04:00
TwinProduction	ed4ed520b7	Update Docker instructions	2020-09-06 00:27:26 -04:00
TwinProduction	6e1f888e39	Improve test coverage	2020-09-05 00:01:12 -04:00