Merge branch 'master' into feature/client_certs

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+## Prometheus Community Code of Conduct
+
+Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

Makefile.common

@@ -150,6 +150,17 @@ else
 	$(GO) get $(GOOPTS) -t ./...
 endif
 
+.PHONY: update-go-deps
+update-go-deps:
+	@echo ">> updating Go dependencies"
+	@for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
+		$(GO) get $$m; \
+	done
+	GO111MODULE=$(GO111MODULE) $(GO) mod tidy
+ifneq (,$(wildcard vendor))
+	GO111MODULE=$(GO111MODULE) $(GO) mod vendor
+endif
+
 .PHONY: common-test-short
 common-test-short: $(GOTEST_DIR)
 	@echo ">> running short tests"

examples/jiralert.yml

@@ -1,3 +1,4 @@
+---
 # Global defaults, applied to all receivers where not explicitly overridden. Optional.
 defaults:
   # API access fields.
@@ -38,17 +39,17 @@ receivers:
     # Overrides default.
     issue_type: Task
     # JIRA components. Optional.
-    components: [ 'Operations' ]
+    components: ['Operations']
     # Standard or custom field values to set on created issue. Optional.
     #
     # See https://developer.atlassian.com/server/jira/platform/jira-rest-api-examples/#setting-custom-field-data-for-other-field-types for further examples.
     fields:
       # TextField
       customfield_10001: "Random text"
       # SelectList
-      customfield_10002: { "value": "red" }
+      customfield_10002: {"value": "red"}
       # MultiSelect
-      customfield_10003: [{"value": "red" }, {"value": "blue" }, {"value": "green" }]
+      customfield_10003: [{"value": "red"}, {"value": "blue"}, {"value": "green"}]
 
 # File containing template definitions. Required.
 template: jiralert.tmpl