Merge pull request #258 from cloudflare/0.9.2

Prepare for 0.9.2 release

Author: prymitive

.travis.yml

@@ -1,6 +1,6 @@
 defaults_go: &DEFAULTS_GO
   language: go
-  go: "1.9.2"
+  go: "1.10.1"
   cache:
     directories:
       - vendor

Dockerfile

@@ -3,7 +3,7 @@ RUN apk add --update make git
 COPY . /unsee
 RUN make -C /unsee webpack
 
-FROM golang:1.9.2-alpine3.6 as go-builder
+FROM golang:1.10.1-alpine as go-builder
 COPY --from=nodejs-builder /unsee /go/src/github.com/cloudflare/unsee
 ARG VERSION
 RUN apk add --update make git

Gopkg.toml

@@ -19,6 +19,9 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
+[prune]
+  go-tests = true
+  unused-packages = true
 
 [[constraint]]
   branch = "master"

Makefile

@@ -2,7 +2,7 @@ NAME    := unsee
 VERSION := $(shell git describe --tags --always --dirty='-dev')
 
 # Alertmanager instance used when running locally, points to mock data
-MOCK_PATH         := $(CURDIR)/internal/mock/0.13.0
+MOCK_PATH         := $(CURDIR)/internal/mock/0.14.0
 ALERTMANAGER_URI := "file://$(MOCK_PATH)"
 # Listen port when running locally
 PORT := 8080
@@ -49,25 +49,22 @@ endif
 	touch $@
 
 bindata_assetfs.go: .build/deps-build-go.ok .build/artifacts-bindata_assetfs.$(GO_BINDATA_MODE) .build/vendor.ok .build/artifacts-webpack.ok
-	go-bindata-assetfs $(GO_BINDATA_FLAGS) -prefix assets -nometadata assets/templates/... assets/static/dist/...
+	go-bindata-assetfs $(GO_BINDATA_FLAGS) -o bindata_assetfs.go -prefix assets -nometadata assets/templates/... assets/static/dist/...
 
 $(NAME): .build/deps-build-go.ok .build/vendor.ok bindata_assetfs.go $(SOURCES)
 	go build -ldflags "-X main.version=$(VERSION)"
 
 .build/vendor.ok: .build/deps-build-go.ok Gopkg.lock Gopkg.toml
 	dep ensure
-	dep prune
 	touch $@
 
 .PHONY: vendor
 vendor: .build/deps-build-go.ok
 	dep ensure
-	dep prune
 
 .PHONY: vendor-update
 vendor-update: .build/deps-build-go.ok
 	dep ensure -update
-	dep prune
 
 .PHONY: webpack
 webpack: .build/artifacts-webpack.ok

api_test.go

@@ -870,7 +870,10 @@ func testAlert(version string, t *testing.T, expectedAlert, gotAlert models.Aler
 					for _, es := range expectedAM.Silences {
 						foundSilence := false
 						for _, gs := range gotAM.Silences {
-							if es.Comment == gs.Comment && es.CreatedBy == gs.CreatedBy && es.JiraID == gs.JiraID && es.JiraURL == es.JiraURL {
+							if es.Comment == gs.Comment &&
+								es.CreatedBy == gs.CreatedBy &&
+								es.JiraID == gs.JiraID &&
+								es.JiraURL == gs.JiraURL {
 								foundSilence = true
 							}
 						}
@@ -891,11 +894,11 @@ func testAlert(version string, t *testing.T, expectedAlert, gotAlert models.Aler
 }
 
 func testAlertGroup(version string, t *testing.T, testCase groupTest, group models.AlertGroup) {
-	if testCase.hash != group.Hash {
-		// FIXME this is different per mock version due to startsAt / endsAt
-		// t.Errorf("[%s] Alert group.Hash mismatch, expected '%s' but got '%s' for group %v",
-		// version, testCase.hash, group.Hash, group.Labels)
-	}
+	//if testCase.hash != group.Hash {
+	// FIXME this is different per mock version due to startsAt / endsAt
+	// t.Errorf("[%s] Alert group.Hash mismatch, expected '%s' but got '%s' for group %v",
+	// version, testCase.hash, group.Hash, group.Labels)
+	//}
 	if testCase.id != group.ID {
 		t.Errorf("[%s] Alert group.ID mismatch, expected '%s' but got '%s' for group %v",
 			version, testCase.id, group.ID, group.Labels)

assets/static/base.css

@@ -250,15 +250,19 @@ blockquote.silence-comment {
   margin-bottom: 2px;
   padding-left: 0;
   padding-right: 2px;
-  padding-top: 2px;
+  padding-top: 0;
   padding-bottom: 0;
 }
+.silence-block.well {
+  border: 0;
+}
 
 /* button is an icon inside a well, it gets white color
    make it dark gray by default, so it's visible but doesn't stand out
   and black on hover */
 button.silence-delete {
   color: inherit;
+  margin-top: 2px;
 }
 button.silence-delete:hover,
 button.silence-delete:focus {
@@ -270,7 +274,7 @@ button.silence-delete:focus {
 }
 
 .incident {
-    padding: 8px;
+    padding: 5px;
 }
 
 .incident>.panel>.panel-heading {

docs/CODEOWNERS

@@ -0,0 +1,5 @@
+# CODEOWNERS file lists people and teams responsible for code in this
+# repository.
+# See https://help.github.com/articles/about-codeowners/ for details.
+
+* @prymitive

internal/config/config.go

@@ -172,6 +172,7 @@ func (config *configSchema) LogValues() {
 			URI:     hideURLPassword(s.URI),
 			Timeout: s.Timeout,
 			TLS:     s.TLS,
+			Proxy:   s.Proxy,
 		}
 		servers = append(servers, server)
 	}