default to Marathon auto-follow

Author: aleks-f

userspace/libsinsp/sinsp.cpp

@@ -1608,7 +1608,7 @@ void sinsp::init_mesos_client(string* api_server, bool verbose)
 									m_marathon_api_server,
 									mesos::default_groups_api,
 									mesos::default_apps_api,
-									false, // no leader follow
+									m_marathon_api_server.empty(), // leader auto-follow if no uri
 									mesos::default_timeout_ms,
 									is_live,
 									m_verbose_json);

userspace/sysdig/man/csysdig.8

@@ -419,7 +419,19 @@ Print program logs into the given file.
 Enable Mesos support by connecting to the API server specified as
 argument (e.g.
 <http://admin:password@127.0.0.1:5050>).
-Marathon url is optional and defaults to Mesos address, port 8080.
+Mesos url is required.
+Marathon url is optional, defaulting to auto\-follow \- if Marathon API
+server is not provided, sysdig will attempt to retrieve (and
+subsequently follow, if it migrates) the location of Marathon API server
+from the Mesos master.
+Note that, with auto\-follow, sysdig will likely receive a cluster
+internal IP address for Marathon API server, so running sysdig with
+Marathon auto\-follow from a node that is not part of Mesos cluster may
+not work.
+Additionally, running sydig with Mesos support on a node that has no
+containers managed by Mesos is of limited use because, although cluster
+metadata will be collected, there will be no Mesos/Marathon filtering
+capability.
 The API servers can also be specified via the environment variable
 SYSDIG_MESOS_API.
 .PP

userspace/sysdig/man/csysdig.md

@@ -182,7 +182,7 @@ COMMAND LINE OPTIONS
   Print program logs into the given file.
 
 **-m** _url[,marathon-url]_, **--mesos-api=**_url[,marathon-url]_
-  Enable Mesos support by connecting to the API server specified as argument (e.g. http://admin:password@127.0.0.1:5050). Marathon url is optional and defaults to Mesos address, port 8080. The API servers can also be specified via the environment variable SYSDIG_MESOS_API.
+  Enable Mesos support by connecting to the API server specified as argument (e.g. http://admin:password@127.0.0.1:5050). Mesos url is required. Marathon url is optional, defaulting to auto-follow - if Marathon API server is not provided, sysdig will attempt to retrieve (and subsequently follow, if it migrates) the location of Marathon API server from the Mesos master. Note that, with auto-follow, sysdig will likely receive a cluster internal IP address for Marathon API server, so running sysdig with Marathon auto-follow from a node that is not part of Mesos cluster may not work. Additionally, running sydig with Mesos support on a node that has no containers managed by Mesos is of limited use because, although cluster metadata will be collected, there will be no Mesos/Marathon filtering capability. The API servers can also be specified via the environment variable SYSDIG_MESOS_API.
 
 **-N**
   Don't convert port numbers to names.

userspace/sysdig/man/sysdig.8

@@ -397,7 +397,19 @@ Use \-lv to get additional information for each field.
 Enable Mesos support by connecting to the API server specified as
 argument (e.g.
 <http://admin:password@127.0.0.1:5050>).
-Marathon url is optional and defaults to Mesos address, port 8080.
+Mesos url is required.
+Marathon url is optional, defaulting to auto\-follow \- if Marathon API
+server is not provided, sysdig will attempt to retrieve (and
+subsequently follow, if it migrates) the location of Marathon API server
+from the Mesos master.
+Note that, with auto\-follow, sysdig will likely receive a cluster
+internal IP address for Marathon API server, so running sysdig with
+Marathon auto\-follow from a node that is not part of Mesos cluster may
+not work.
+Additionally, running sydig with Mesos support on a node that has no
+containers managed by Mesos is of limited use because, although cluster
+metadata will be collected, there will be no Mesos/Marathon filtering
+capability.
 The API servers can also be specified via the environment variable
 SYSDIG_MESOS_API.
 .PP

userspace/sysdig/man/sysdig.md

@@ -154,7 +154,7 @@ OPTIONS
   List the fields that can be used for filtering and output formatting. Use -lv to get additional information for each field.
 
 **-m** _url[,marathon-url]_, **--mesos-api=**_url[,marathon-url]_
-  Enable Mesos support by connecting to the API server specified as argument (e.g. http://admin:password@127.0.0.1:5050). Marathon url is optional and defaults to Mesos address, port 8080. The API servers can also be specified via the environment variable SYSDIG_MESOS_API.
+  Enable Mesos support by connecting to the API server specified as argument (e.g. http://admin:password@127.0.0.1:5050). Mesos url is required. Marathon url is optional, defaulting to auto-follow - if Marathon API server is not provided, sysdig will attempt to retrieve (and subsequently follow, if it migrates) the location of Marathon API server from the Mesos master. Note that, with auto-follow, sysdig will likely receive a cluster internal IP address for Marathon API server, so running sysdig with Marathon auto-follow from a node that is not part of Mesos cluster may not work. Additionally, running sydig with Mesos support on a node that has no containers managed by Mesos is of limited use because, although cluster metadata will be collected, there will be no Mesos/Marathon filtering capability. The API servers can also be specified via the environment variable SYSDIG_MESOS_API.
 
 **-N**
   Don't convert port numbers to names.