enable json formatting, use queryoptions

command/agent/agent_endpoint.go

@@ -9,6 +9,7 @@ import (
 	"net"
 	"net/http"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/docker/docker/pkg/ioutils"
@@ -165,7 +166,7 @@ func (s *HTTPServer) AgentMonitor(resp http.ResponseWriter, req *http.Request) (
 	}
 
 	// Get the provided loglevel.
-	logLevel := req.URL.Query().Get("loglevel")
+	logLevel := req.URL.Query().Get("log-level")
 	if logLevel == "" {
 		logLevel = "INFO"
 	}
@@ -175,13 +176,19 @@ func (s *HTTPServer) AgentMonitor(resp http.ResponseWriter, req *http.Request) (
 	}
 
 	// Determine if we are targeting a server or client
-	nodeID := req.URL.Query().Get("nodeID")
+	nodeID := req.URL.Query().Get("node-id")
+
+	logJSONStr := req.URL.Query().Get("log-json")
+	logJSON, err := strconv.ParseBool(logJSONStr)
+	if err != nil {
+		logJSON = false
+	}
 
 	// Build the request and parse the ACL token
 	args := cstructs.MonitorRequest{
 		NodeID:   nodeID,
 		LogLevel: logLevel,
-		LogJSON:  false,
+		LogJSON:  logJSON,
 	}
 	s.parse(resp, req, &args.QueryOptions.Region, &args.QueryOptions)
 
@@ -208,7 +215,7 @@ func (s *HTTPServer) AgentMonitor(resp http.ResponseWriter, req *http.Request) (
 	decoder := codec.NewDecoder(httpPipe, structs.MsgpackHandle)
 	encoder := codec.NewEncoder(httpPipe, structs.MsgpackHandle)
 
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(req.Context())
 	go func() {
 		<-ctx.Done()
 		httpPipe.Close()

command/agent/agent_endpoint_test.go

@@ -256,7 +256,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 
 	httpTest(t, nil, func(s *TestAgent) {
 		{
-			req, err := http.NewRequest("GET", "/v1/agent/monitor?loglevel=unknown", nil)
+			req, err := http.NewRequest("GET", "/v1/agent/monitor?log-level=unknown", nil)
 			require.Nil(t, err)
 			resp := newClosableRecorder()
 
@@ -269,7 +269,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 
 		// check for a specific log
 		{
-			req, err := http.NewRequest("GET", "/v1/agent/monitor?loglevel=warn", nil)
+			req, err := http.NewRequest("GET", "/v1/agent/monitor?log-level=warn", nil)
 			require.Nil(t, err)
 			resp := newClosableRecorder()
 			defer resp.Close()
@@ -305,7 +305,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 
 		// stream logs for a given node
 		{
-			req, err := http.NewRequest("GET", "/v1/agent/monitor?loglevel=warn&nodeID="+s.client.NodeID(), nil)
+			req, err := http.NewRequest("GET", "/v1/agent/monitor?log-level=warn&node-id="+s.client.NodeID(), nil)
 			require.Nil(t, err)
 			resp := newClosableRecorder()
 			defer resp.Close()

command/agent/monitor/monitor.go

@@ -41,6 +41,9 @@ func (d *Monitor) Start(stopCh <-chan struct{}) <-chan []byte {
 			case log := <-d.logCh:
 				logCh <- log
 			case <-stopCh:
+				d.Lock()
+				defer d.Unlock()
+
 				d.logger.DeregisterSink(d.sink)
 				close(d.logCh)
 				return

command/agent_monitor.go

@@ -4,9 +4,11 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"strconv"
 	"strings"
 	"syscall"
 
+	"github.com/hashicorp/nomad/api"
 	"github.com/mitchellh/cli"
 )
 
@@ -46,10 +48,13 @@ func (c *MonitorCommand) Run(args []string) int {
 
 	var logLevel string
 	var nodeID string
+	var logJSON bool
+
 	flags := c.Meta.FlagSet(c.Name(), FlagSetClient)
 	flags.Usage = func() { c.Ui.Output(c.Help()) }
 	flags.StringVar(&logLevel, "log-level", "", "")
 	flags.StringVar(&nodeID, "node-id", "", "")
+	flags.BoolVar(&logJSON, "log-json", false, "")
 
 	if err := flags.Parse(args); err != nil {
 		return 1
@@ -62,8 +67,17 @@ func (c *MonitorCommand) Run(args []string) int {
 		return 1
 	}
 
+	params := map[string]string{
+		"log-level": logLevel,
+		"node-id":   nodeID,
+		"log-json":  strconv.FormatBool(logJSON),
+	}
+
+	query := &api.QueryOptions{
+		Params: params,
+	}
 	eventDoneCh := make(chan struct{})
-	logCh, err := client.Agent().Monitor(logLevel, nodeID, eventDoneCh, nil)
+	logCh, err := client.Agent().Monitor(eventDoneCh, query)
 	if err != nil {
 		c.Ui.Error(fmt.Sprintf("Error starting monitor: %s", err))
 		c.Ui.Error(commandErrorText(c))