Merge pull request #173 from hashicorp/f-agent-self

Add `/v1/agent/self` and return local agent config

command/agent/agent.go

@@ -311,6 +311,11 @@ func (a *Agent) ForceLeave(node string) (err error) {
 	return err
 }
 
+// LocalMember is used to return the local node
+func (a *Agent) LocalMember() serf.Member {
+	return a.server.LocalMember()
+}
+
 // LANMembers is used to retrieve the LAN members
 func (a *Agent) LANMembers() []serf.Member {
 	if a.server != nil {

command/agent/agent_endpoint.go

@@ -3,10 +3,23 @@ package agent
 import (
 	"fmt"
 	"github.com/hashicorp/consul/consul/structs"
+	"github.com/hashicorp/serf/serf"
 	"net/http"
 	"strings"
 )
 
+type AgentSelf struct {
+	Config *Config
+	Member serf.Member
+}
+
+func (s *HTTPServer) AgentSelf(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
+	return AgentSelf{
+		Config: s.agent.config,
+		Member: s.agent.LocalMember(),
+	}, nil
+}
+
 func (s *HTTPServer) AgentServices(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
 	services := s.agent.state.Services()
 	return services, nil

command/agent/agent_endpoint_test.go

@@ -66,6 +66,32 @@ func TestHTTPAgentChecks(t *testing.T) {
 	}
 }
 
+func TestHTTPAgentSelf(t *testing.T) {
+	dir, srv := makeHTTPServer(t)
+	defer os.RemoveAll(dir)
+	defer srv.Shutdown()
+	defer srv.agent.Shutdown()
+
+	req, err := http.NewRequest("GET", "/v1/agent/self", nil)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	obj, err := srv.AgentSelf(nil, req)
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+
+	val := obj.(AgentSelf)
+	if int(val.Member.Port) != srv.agent.config.Ports.SerfLan {
+		t.Fatalf("incorrect port: %v", obj)
+	}
+
+	if int(val.Config.Ports.SerfLan) != srv.agent.config.Ports.SerfLan {
+		t.Fatalf("incorrect port: %v", obj)
+	}
+}
+
 func TestHTTPAgentMembers(t *testing.T) {
 	dir, srv := makeHTTPServer(t)
 	defer os.RemoveAll(dir)

command/agent/http.go

@@ -76,6 +76,7 @@ func (s *HTTPServer) registerHandlers(enableDebug bool) {
 	s.mux.HandleFunc("/v1/health/state/", s.wrap(s.HealthChecksInState))
 	s.mux.HandleFunc("/v1/health/service/", s.wrap(s.HealthServiceNodes))
 
+	s.mux.HandleFunc("/v1/agent/self", s.wrap(s.AgentSelf))
 	s.mux.HandleFunc("/v1/agent/services", s.wrap(s.AgentServices))
 	s.mux.HandleFunc("/v1/agent/checks", s.wrap(s.AgentChecks))
 	s.mux.HandleFunc("/v1/agent/members", s.wrap(s.AgentMembers))

command/agent/http_api.md

@@ -28,6 +28,7 @@ Status:
 * /v1/status/peers : Returns the current Raft peer set
 
 Agent:
+* /v1/agent/self : Returns the local configuration
 * /v1/agent/checks : Returns the checks the local agent is managing
 * /v1/agent/services : Returns the services local agent is managing
 * /v1/agent/members : Returns the members as seen by the local serf agent

consul/server.go

@@ -457,6 +457,11 @@ func (s *Server) JoinWAN(addrs []string) (int, error) {
 	return s.serfWAN.Join(addrs, true)
 }
 
+// LocalMember is used to return the local node
+func (c *Server) LocalMember() serf.Member {
+	return c.serfLAN.LocalMember()
+}
+
 // LANMembers is used to return the members of the LAN cluster
 func (s *Server) LANMembers() []serf.Member {
 	return s.serfLAN.Members()

website/source/docs/agent/http.html.markdown

@@ -203,6 +203,7 @@ The following endpoints are supported:
 * /v1/agent/checks : Returns the checks the local agent is managing
 * /v1/agent/services : Returns the services local agent is managing
 * /v1/agent/members : Returns the members as seen by the local serf agent
+* /v1/agent/self : Returns the local node configuration
 * /v1/agent/join/\<address\> : Trigger local agent to join a node
 * /v1/agent/force-leave/\<node\>: Force remove node
 * /v1/agent/check/register : Registers a new local check
@@ -290,6 +291,77 @@ This endpoint returns a JSON body like:
         }
     ]
 
+### /v1/agent/self
+
+This endpoint is used to return configuration of the local agent and member information.
+
+It returns a JSON body like this:
+
+    {
+        "Config": {
+            "Bootstrap": true,
+            "Server": true,
+            "Datacenter": "dc1",
+            "DataDir": "/tmp/consul",
+            "DNSRecursor": "",
+            "Domain": "consul.",
+            "EncryptKey": "",
+            "LogLevel": "INFO",
+            "NodeName": "foobar",
+            "ClientAddr": "127.0.0.1",
+            "BindAddr": "0.0.0.0",
+            "AdvertiseAddr": "10.1.10.12",
+            "Ports": {
+                "DNS": 8600,
+                "HTTP": 8500,
+                "RPC": 8400,
+                "SerfLan": 8301,
+                "SerfWan": 8302,
+                "Server": 8300
+            },
+            "LeaveOnTerm": false,
+            "SkipLeaveOnInt": false,
+            "StatsiteAddr": "",
+            "Protocol": 1,
+            "EnableDebug": false,
+            "VerifyIncoming": false,
+            "VerifyOutgoing": false,
+            "CAFile": "",
+            "CertFile": "",
+            "KeyFile": "",
+            "StartJoin": [],
+            "UiDir": "",
+            "PidFile": "",
+            "EnableSyslog": false,
+            "RejoinAfterLeave": false,
+            "AEInterval": 60000000000,
+            "Checks": null,
+            "Services": null,
+            "ConsulConfig": null
+        },
+        "Member": {
+            "Name": "foobar",
+            "Addr": "10.1.10.12",
+            "Port": 8301,
+            "Tags": {
+                "bootstrap": "1",
+                "dc": "dc1",
+                "port": "8300",
+                "role": "consul",
+                "vsn": "1",
+                "vsn_max": "1",
+                "vsn_min": "1"
+            },
+            "Status": 1,
+            "ProtocolMin": 1,
+            "ProtocolMax": 2,
+            "ProtocolCur": 2,
+            "DelegateMin": 2,
+            "DelegateMax": 4,
+            "DelegateCur": 4
+        }
+    }
+
 ### /v1/agent/join/\<address\>
 
 This endpoint is hit with a GET and is used to instruct the agent to attempt to