diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..31fc5973c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,54 @@
+---
+name: Bug Report
+about: You're experiencing an issue with Consul that is different than the documented behavior.
+
+---
+
+When filing a bug, please include the following headings if
+possible. Any example text in this template can be deleted.
+
+#### Overview of the Issue
+
+A paragraph or two about the issue you're experiencing.
+
+#### Reproduction Steps
+
+Steps to reproduce this issue, eg:
+
+1. Create a cluster with n client nodes n and n server nodes
+1. Run `curl ...`
+1. View error
+
+### Consul info for both Client and Server
+
+
+ Client info
+
+```
+output from client 'consul info' command here
+```
+
+
+
+
+ Server info
+
+```
+output from server 'consul info' command here
+```
+
+
+
+### Operating system and Environment details
+
+OS, Architecture, and any other information you can provide
+about the environment.
+
+### Log Fragments
+
+Include appropriate Client or Server log fragments.
+If the log is longer than a few dozen lines, please
+include the URL to the [gist](https://gist.github.com/)
+of the log instead of posting it in the issue.
+
+Use `-log-level=TRACE` on the client and server to capture the maximum log detail.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..fb9b6b4ef
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,15 @@
+---
+name: Feature Request
+about: If you have something you think Consul could improve or add support for.
+
+---
+
+Please search the existing issues for relevant feature requests, and use the reaction feature (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to add upvotes to pre-existing requests.
+
+#### Feature Description
+
+A written overview of the feature.
+
+#### Use Case(s)
+
+Any relevant use-cases that you see.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 000000000..d85f76d9a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,11 @@
+---
+name: Question
+about: If you have a question, please check out our other community resources instead of opening an issue.
+
+---
+
+Issues on GitHub are intended to be related to bugs or feature requests, so we recommend using our other community resources instead of asking here.
+
+- [FAQ (Frequently asked questions)](https://www.consul.io/docs/faq.html)
+- [Consul Guides](https://www.consul.io/docs/guides/index.html)
+- Any other questions can be sent to the [consul mailing list](https://www.consul.io/community.html)
diff --git a/.github/ISSUE_TEMPLATE/ui_issues.md b/.github/ISSUE_TEMPLATE/ui_issues.md
new file mode 100644
index 000000000..edac9bf2d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/ui_issues.md
@@ -0,0 +1,19 @@
+---
+name: Web UI Feedback
+about: You have usage feedback for either version of the web UI
+
+---
+
+**Old UI or New UI**
+If you're using Consul 1.1.0 or later, you can use the new UI with the change of
+an environment variable. Let us know which UI you're using so that we can help.
+
+**Describe the problem you're having**
+A clear and concise description of what could be better. If you have screenshots
+of a bug, place them here.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Share inspiration**
+How have you seen this problem solved well in other UIs?
diff --git a/.gitignore b/.gitignore
index 70c75111b..f373cf40e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
*.swp
*.test
.DS_Store
+.fseventsd
.vagrant/
/pkg
Thumbs.db
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80adca4b9..7a5dfd551 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,54 @@
-## (UNRELEASED)
+## UNRELEASED
+
+FEATURES:
+
+* dns: Enable PTR record lookups for services with IPs that have no registered node [[PR-4083](https://github.com/hashicorp/consul/pull/4083)]
+
+IMPROVEMENTS:
+
+* agent: A Consul user-agent string is now sent to providers when making retry-join requests [GH-4013](https://github.com/hashicorp/consul/pull/4013)
+
+BUG FIXES:
+
+* agent: Fixed an issue where watches were being duplicated on reload. [[GH-4179](https://github.com/hashicorp/consul/issues/4179)]
+* agent: Fixed an issue with Agent watches on a HTTPS only agent would fail to use TLS. [[GH-4076](https://github.com/hashicorp/consul/issues/4076)]
+* agent: Fixed bug that would cause unnecessary and frequent logging yamux keepalives [[GH-3040](https://github.com/hashicorp/consul/issues/3040)]
+* dns: Re-enable full DNS compression [[GH-4071](https://github.com/hashicorp/consul/issues/4071)]
+
+## 1.1.0 (May 11, 2018)
+
+FEATURES:
+
+* UI: The web UI has been completely redesigned and rebuilt and is in an opt-in beta period.
+Setting the `CONSUL_UI_BETA` environment variable to `1` or `true` will replace the existing UI
+with the new one. The existing UI will be deprecated and removed in a future release. [[GH-4086](https://github.com/hashicorp/consul/pull/4086)]
+* api: Added support for Prometheus client format in metrics endpoint with `?format=prometheus` (see [docs](https://www.consul.io/api/agent.html#view-metrics)) [[GH-4014](https://github.com/hashicorp/consul/issues/4014)]
+* agent: New Cloud Auto-join provider: Joyent Triton. [[GH-4108](https://github.com/hashicorp/consul/pull/4108)]
+* agent: (Consul Enterprise) Implemented license management with license propagation within a datacenter.
+
+BREAKING CHANGES:
+
+* agent: The following previously deprecated fields and config options have been removed [[GH-4097](https://github.com/hashicorp/consul/pull/4097)]:
+ - `CheckID` has been removed from config file check definitions (use `id` instead).
+ - `script` has been removed from config file check definitions (use `args` instead).
+ - `enableTagOverride` is no longer valid in service definitions (use `enable_tag_override` instead).
+ - The [deprecated set of metric names](https://consul.io/docs/upgrade-specific.html#metric-names-updated) (beginning with `consul.consul.`) has been removed along with the `enable_deprecated_names` option from the metrics configuration.
+
+IMPROVEMENTS:
+
+* agent: Improve DNS performance on large clusters [[GH-4036](https://github.com/hashicorp/consul/issues/4036)]
+* agent: `start_join`, `start_join_wan`, `retry_join`, `retry_join_wan` config params now all support go-sockaddr templates [[GH-4102](https://github.com/hashicorp/consul/pull/4102)]
+* server: Added new configuration options `raft_snapshot_interval` and `raft_snapshot_threshold` to allow operators to configure how often servers take raft snapshots. The default values for these have been tuned for large and busy clusters with high write load. [[GH-4105](https://github.com/hashicorp/consul/pull/4105/)]
+
+BUG FIXES:
+
+* agent: Only call signal.Notify once during agent startup [[PR-4024](https://github.com/hashicorp/consul/pull/4024)]
+* agent: Add support for the new Service Meta field in agent config [[GH-4045](https://github.com/hashicorp/consul/issues/4045)]
+* api: Add support for the new Service Meta field in API client [[GH-4045](https://github.com/hashicorp/consul/issues/4045)]
+* agent: Updated serf library for two bug fixes - allow enough time for leave intents to propagate [[GH-510](https://github.com/hashicorp/serf/pull/510)] and preventing a deadlock [[GH-507](https://github.com/hashicorp/serf/pull/510)]
+* agent: When node-level checks (e.g. maintenance mode) were deleted, some watchers currently in between blocking calls may have missed the change in index. See [[GH-3970](https://github.com/hashicorp/consul/pull/3970)]
+
+## 1.0.7 (April 13, 2018)
IMPROVEMENTS:
@@ -13,7 +63,9 @@ IMPROVEMENTS:
* dns: Introduced a new config param to limit the number of A/AAAA records returned. [[GH-3940](https://github.com/hashicorp/consul/issues/3940)]
* dns: Upgrade vendored DNS library to pick up bugfixes and improvements. [[GH-3978](https://github.com/hashicorp/consul/issues/3978)]
* server: Updated yamux library to pick up a performance improvement. [[GH-3982](https://github.com/hashicorp/consul/issues/3982)]
+* server: Add near=\_ip support for prepared queries [[GH-3798](https://github.com/hashicorp/consul/issues/3798)]
* api: Add support for GZIP compression in HTTP responses. [[GH-3687](https://github.com/hashicorp/consul/issues/3687)]
+* api: Add `IgnoreCheckIDs` to Prepared Query definition to allow temporarily bypassing faulty health checks [[GH-3727](https://github.com/hashicorp/consul/issues/3727)]
BUG FIXES:
diff --git a/GNUmakefile b/GNUmakefile
index 81fc1a91c..bebe8bce5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -121,8 +121,7 @@ ui:
# also run as part of the release build script when it verifies that there are no
# changes to the UI assets that aren't checked in.
static-assets:
- @go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/...
- @mv bindata_assetfs.go agent/
+ @go-bindata-assetfs -pkg agent -prefix pkg -o agent/bindata_assetfs.go ./pkg/web_ui/...
$(MAKE) format
tools:
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 9729186aa..000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,35 +0,0 @@
-If you have a question, please direct it to the
-[consul mailing list](https://www.consul.io/community.html) if it hasn't been
-addressed in either the [FAQ](https://www.consul.io/docs/faq.html) or in one
-of the [Consul Guides](https://www.consul.io/docs/guides/index.html).
-
-When filing a bug, please include the following:
-
-### Description of the Issue (and unexpected/desired result)
-
-### Reproduction steps
-
-### `consul version` for both Client and Server
-Client: `[client version here]`
-Server: `[server version here]`
-
-### `consul info` for both Client and Server
-Client:
-```
-[Client `consul info` here]
-```
-
-Server:
-```
-[Server `consul info` here]
-```
-
-### Operating system and Environment details
-
-### Log Fragments or Link to [gist](https://gist.github.com/)
-
-Include appropriate Client or Server log fragments. If the log is longer
-than a few dozen lines, please include the URL to the
-[gist](https://gist.github.com/).
-
-TIP: Use `-log-level=TRACE` on the client and server to capture the maximum log detail.
diff --git a/agent/acl.go b/agent/acl.go
index 4245c53a0..0bf4180eb 100644
--- a/agent/acl.go
+++ b/agent/acl.go
@@ -143,11 +143,9 @@ func (m *aclManager) lookupACL(a *Agent, id string) (acl.ACL, error) {
cached = raw.(*aclCacheEntry)
}
if cached != nil && time.Now().Before(cached.Expires) {
- metrics.IncrCounter([]string{"consul", "acl", "cache_hit"}, 1)
metrics.IncrCounter([]string{"acl", "cache_hit"}, 1)
return cached.ACL, nil
}
- metrics.IncrCounter([]string{"consul", "acl", "cache_miss"}, 1)
metrics.IncrCounter([]string{"acl", "cache_miss"}, 1)
// At this point we might have a stale cached ACL, or none at all, so
diff --git a/agent/agent.go b/agent/agent.go
index caf515084..6d9f80252 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -74,6 +74,7 @@ type delegate interface {
Shutdown() error
Stats() map[string]map[string]string
ReloadConfig(config *consul.Config) error
+ enterpriseDelegate
}
// notifier is called after a successful JoinLAN.
@@ -647,14 +648,19 @@ func (a *Agent) reloadWatches(cfg *config.RuntimeConfig) error {
// Determine the primary http(s) endpoint.
var netaddr net.Addr
+ https := false
if len(cfg.HTTPAddrs) > 0 {
netaddr = cfg.HTTPAddrs[0]
} else {
netaddr = cfg.HTTPSAddrs[0]
+ https = true
}
addr := netaddr.String()
if netaddr.Network() == "unix" {
addr = "unix://" + addr
+ https = false
+ } else if https {
+ addr = "https://" + addr
}
// Fire off a goroutine for each new watch plan.
@@ -670,7 +676,19 @@ func (a *Agent) reloadWatches(cfg *config.RuntimeConfig) error {
wp.Handler = makeHTTPWatchHandler(a.LogOutput, httpConfig)
}
wp.LogOutput = a.LogOutput
- if err := wp.Run(addr); err != nil {
+
+ config := api.DefaultConfig()
+ if https {
+ if a.config.CAPath != "" {
+ config.TLSConfig.CAPath = a.config.CAPath
+ }
+ if a.config.CAFile != "" {
+ config.TLSConfig.CAFile = a.config.CAFile
+ }
+ config.TLSConfig.Address = addr
+ }
+
+ if err := wp.RunWithConfig(addr, config); err != nil {
a.logger.Printf("[ERR] agent: Failed to run watch: %v", err)
}
}(wp)
@@ -764,6 +782,12 @@ func (a *Agent) consulConfig() (*consul.Config, error) {
if a.config.RaftProtocol != 0 {
base.RaftConfig.ProtocolVersion = raft.ProtocolVersion(a.config.RaftProtocol)
}
+ if a.config.RaftSnapshotThreshold != 0 {
+ base.RaftConfig.SnapshotThreshold = uint64(a.config.RaftSnapshotThreshold)
+ }
+ if a.config.RaftSnapshotInterval != 0 {
+ base.RaftConfig.SnapshotInterval = a.config.RaftSnapshotInterval
+ }
if a.config.ACLMasterToken != "" {
base.ACLMasterToken = a.config.ACLMasterToken
}
@@ -1845,7 +1869,6 @@ func (a *Agent) AddCheck(check *structs.HealthCheck, chkType *structs.CheckType,
CheckID: check.CheckID,
DockerContainerID: chkType.DockerContainerID,
Shell: chkType.Shell,
- Script: chkType.Script,
ScriptArgs: chkType.ScriptArgs,
Interval: chkType.Interval,
Logger: a.logger,
@@ -1876,7 +1899,6 @@ func (a *Agent) AddCheck(check *structs.HealthCheck, chkType *structs.CheckType,
monitor := &checks.CheckMonitor{
Notify: a.State,
CheckID: check.CheckID,
- Script: chkType.Script,
ScriptArgs: chkType.ScriptArgs,
Interval: chkType.Interval,
Timeout: chkType.Timeout,
diff --git a/agent/agent_endpoint.go b/agent/agent_endpoint.go
index 0e2b4b480..8d7728f1c 100644
--- a/agent/agent_endpoint.go
+++ b/agent/agent_endpoint.go
@@ -19,6 +19,8 @@ import (
"github.com/hashicorp/logutils"
"github.com/hashicorp/serf/coordinate"
"github.com/hashicorp/serf/serf"
+ "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/client_golang/prometheus/promhttp"
)
type Self struct {
@@ -75,6 +77,14 @@ func (s *HTTPServer) AgentSelf(resp http.ResponseWriter, req *http.Request) (int
}, nil
}
+// enablePrometheusOutput will look for Prometheus mime-type or format Query parameter the same way as Nomad
+func enablePrometheusOutput(req *http.Request) bool {
+ if format := req.URL.Query().Get("format"); format == "prometheus" {
+ return true
+ }
+ return false
+}
+
func (s *HTTPServer) AgentMetrics(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
// Fetch the ACL token, if any, and enforce agent policy.
var token string
@@ -86,7 +96,21 @@ func (s *HTTPServer) AgentMetrics(resp http.ResponseWriter, req *http.Request) (
if rule != nil && !rule.AgentRead(s.agent.config.NodeName) {
return nil, acl.ErrPermissionDenied
}
+ if enablePrometheusOutput(req) {
+ if s.agent.config.TelemetryPrometheusRetentionTime < 1 {
+ resp.WriteHeader(http.StatusUnsupportedMediaType)
+ fmt.Fprint(resp, "Prometheus is not enable since its retention time is not positive")
+ return nil, nil
+ }
+ handlerOptions := promhttp.HandlerOpts{
+ ErrorLog: s.agent.logger,
+ ErrorHandling: promhttp.ContinueOnError,
+ }
+ handler := promhttp.HandlerFor(prometheus.DefaultGatherer, handlerOptions)
+ handler.ServeHTTP(resp, req)
+ return nil, nil
+ }
return s.agent.MemSink.DisplayMetrics(resp, req)
}
@@ -131,9 +155,18 @@ func (s *HTTPServer) AgentServices(resp http.ResponseWriter, req *http.Request)
// Use empty list instead of nil
for id, s := range services {
- if s.Tags == nil {
+ if s.Tags == nil || s.Meta == nil {
clone := *s
- clone.Tags = make([]string, 0)
+ if s.Tags == nil {
+ clone.Tags = make([]string, 0)
+ } else {
+ clone.Tags = s.Tags
+ }
+ if s.Meta == nil {
+ clone.Meta = make(map[string]string)
+ } else {
+ clone.Meta = s.Meta
+ }
services[id] = &clone
}
}
diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go
index f4a800b81..50b672b16 100644
--- a/agent/agent_endpoint_test.go
+++ b/agent/agent_endpoint_test.go
@@ -732,14 +732,6 @@ func TestAgent_RegisterCheck_Scripts(t *testing.T) {
name string
check map[string]interface{}
}{
- {
- "<