-
Notifications
You must be signed in to change notification settings - Fork 729
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: removed deprecated features from --help
Signed-off-by: Roberto Scolaro <[email protected]>
- Loading branch information
1 parent
cc2673d
commit 35f1fe2
Showing
2 changed files
with
0 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -149,28 +149,6 @@ static void usage() | |
| " better with terminals like putty. Try to use this flag if you experience\n" | ||
| " terminal issues like the mouse not working.\n" | ||
| " -h, --help Print this page\n" | ||
| #ifndef MINIMAL_BUILD | ||
| " -k <url>, --k8s-api=<url>\n" | ||
| " Enable Kubernetes support by connecting to the API server\n" | ||
| " specified as argument. E.g. \"http://admin:[email protected]:8080\".\n" | ||
| " The API server can also be specified via the environment variable\n" | ||
| " SYSDIG_K8S_API.\n" | ||
| " --node-name=<url>\n" | ||
| " The node name is used as a filter when requesting metadata of pods\n" | ||
| " to the API server; if empty, no filter is set\n" | ||
| " -K <bt_file> | <cert_file>:<key_file[#password]>[:<ca_cert_file>], --k8s-api-cert=<bt_file> | <cert_file>:<key_file[#password]>[:<ca_cert_file>]\n" | ||
| " Use the provided files names to authenticate user and (optionally) verify the K8S API\n" | ||
| " server identity.\n" | ||
| " Each entry must specify full (absolute, or relative to the current directory) path\n" | ||
| " to the respective file.\n" | ||
| " Private key password is optional (needed only if key is password protected).\n" | ||
| " CA certificate is optional. For all files, only PEM file format is supported. \n" | ||
| " Specifying CA certificate only is obsoleted - when single entry is provided \n" | ||
| " for this option, it will be interpreted as the name of a file containing bearer token.\n" | ||
| " Note that the format of this command-line option prohibits use of files whose names contain\n" | ||
| " ':' or '#' characters in the file name.\n" | ||
| " Option can also be provided via the environment variable SYSDIG_K8S_API_CERT.\n" | ||
| #endif // MINIMAL_BUILD | ||
| " -l, --list List all the fields that can be used in views.\n" | ||
| " --large-environment\n" | ||
| " Support environments larger than 4KiB\n" | ||
|
|
@@ -427,7 +405,6 @@ sysdig_init_res csysdig_init(int argc, char **argv) | |
| {"raw", no_argument, 0, 0 }, | ||
| {"snaplen", required_argument, 0, 's' }, | ||
| {"logfile", required_argument, 0, 0 }, | ||
| {"force-tracers-capture", required_argument, 0, 'T'}, | ||
| {"force-term-compat", no_argument, 0, 0}, | ||
| {"sortingcol", required_argument, 0, 0 }, | ||
| {"to", required_argument, 0, 0 }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -240,28 +240,6 @@ static void usage() | |
| #endif | ||
| " -j, --json Emit output as json, data buffer encoding will depend from the\n" | ||
| " print format selected.\n" | ||
| #ifndef MINIMAL_BUILD | ||
| " -k <url>, --k8s-api=<url>\n" | ||
| " Enable Kubernetes support by connecting to the API server\n" | ||
| " specified as argument. E.g. \"http://admin:[email protected]:8080\".\n" | ||
| " The API server can also be specified via the environment variable\n" | ||
| " SYSDIG_K8S_API.\n" | ||
| " --node-name=<url>\n" | ||
| " The node name is used as a filter when requesting metadata of pods\n" | ||
| " to the API server; if empty, no filter is set\n" | ||
| " -K <bt_file> | <cert_file>:<key_file[#password]>[:<ca_cert_file>], --k8s-api-cert=<bt_file> | <cert_file>:<key_file[#password]>[:<ca_cert_file>]\n" | ||
| " Use the provided files names to authenticate user and (optionally) verify the K8S API\n" | ||
| " server identity.\n" | ||
| " Each entry must specify full (absolute, or relative to the current directory) path\n" | ||
| " to the respective file.\n" | ||
| " Private key password is optional (needed only if key is password protected).\n" | ||
| " CA certificate is optional. For all files, only PEM file format is supported. \n" | ||
| " Specifying CA certificate only is obsoleted - when single entry is provided \n" | ||
| " for this option, it will be interpreted as the name of a file containing bearer token.\n" | ||
| " Note that the format of this command-line option prohibits use of files whose names contain\n" | ||
| " ':' or '#' characters in the file name.\n" | ||
| " Option can also be provided via the environment variable SYSDIG_K8S_API_CERT.\n" | ||
| #endif // MINIMAL_BUILD | ||
| " -L, --list-events List the events that the engine supports\n" | ||
| " -l, --list List the fields that can be used for filtering and output\n" | ||
| " formatting. Use -lv to get additional information for each\n" | ||
|
|
@@ -385,10 +363,6 @@ static void usage() | |
| "fields listed by 'sysdig -l'.\n\n" | ||
| "Using -pc or -pcontainer, the default format will be changed to a container-friendly one:\n\n" | ||
| "%%evt.num %%evt.outputtime %%evt.cpu %%container.name (%%container.id) %%proc.name (%%thread.tid:%%thread.vtid) %%evt.dir %%evt.type %%evt.info\n\n" | ||
| "Using -pk or -pkubernetes, the default format will be changed to a kubernetes-friendly one:\n\n" | ||
| "%%evt.num %%evt.outputtime %%evt.cpu %%k8s.pod.name (%%container.id) %%proc.name (%%thread.tid:%%thread.vtid) %%evt.dir %%evt.type %%evt.info\n\n" | ||
| "Using -pm or -pmesos, the default format will be changed to a mesos-friendly one:\n\n" | ||
| "%%evt.num %%evt.outputtime %%evt.cpu %%mesos.task.name (%%container.id) %%proc.name (%%thread.tid:%%thread.vtid) %%evt.dir %%evt.type %%evt.info\n\n" | ||
| "Examples:\n\n" | ||
| " Capture all the events from the live system and print them to screen\n" | ||
| " $ sysdig\n\n" | ||
|
|
@@ -1087,9 +1061,7 @@ sysdig_init_res sysdig_init(int argc, char **argv) | |
| {"snaplen", required_argument, 0, 's' }, | ||
| {"summary", no_argument, 0, 'S' }, | ||
| {"suppress-comm", required_argument, 0, 'U' }, | ||
| {"udig", required_argument, 0, 'u' }, | ||
| {"timetype", required_argument, 0, 't' }, | ||
| {"force-tracers-capture", required_argument, 0, 'T'}, | ||
| {"unbuffered", no_argument, 0, 0 }, | ||
| {"verbose", no_argument, 0, 'v' }, | ||
| {"version", no_argument, 0, 0 }, | ||
|
|
@@ -1384,26 +1356,6 @@ sysdig_init_res sysdig_init(int argc, char **argv) | |
| inspector->set_print_container_data(true); | ||
| } | ||
| } | ||
| else if(std::string(optarg) == "k" || std::string(optarg) == "kubernetes") | ||
| { | ||
| output_format = "*%evt.num %evt.outputtime %evt.cpu %k8s.pod.name (%container.id) %proc.name (%thread.tid:%thread.vtid) %evt.dir %evt.type %evt.info"; | ||
|
|
||
| // This enables chisels to determine if they should print container information | ||
| if(inspector != NULL) | ||
| { | ||
| inspector->set_print_container_data(true); | ||
| } | ||
| } | ||
| else if(std::string(optarg) == "m" || std::string(optarg) == "mesos") | ||
| { | ||
| output_format = "*%evt.num %evt.outputtime %evt.cpu %mesos.task.name (%container.id) %proc.name (%thread.tid:%thread.vtid) %evt.dir %evt.type %evt.info"; | ||
|
|
||
| // This enables chisels to determine if they should print container information | ||
| if(inspector != NULL) | ||
| { | ||
| inspector->set_print_container_data(true); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| output_format = optarg; | ||
|
|
||