diff --git a/js/apps/system/_admin/aardvark/APP/api-docs.json b/js/apps/system/_admin/aardvark/APP/api-docs.json index 9e64eab02b..4e515a0ba0 100644 --- a/js/apps/system/_admin/aardvark/APP/api-docs.json +++ b/js/apps/system/_admin/aardvark/APP/api-docs.json @@ -3727,8 +3727,8 @@ "server_threads_struct": { "description": "Statistics about the server worker threads (excluding V8 specific or jemalloc specific threads and system threads)\n\n", "properties": { - "blocked": { - "description": "The number of worker threads waiting for the availability of resources (like Collection locks)\n\n", + "in-progress": { + "description": "The number of currently busy worker threads\n\n", "format": "", "type": "integer" }, @@ -3737,15 +3737,10 @@ "format": "", "type": "integer" }, - "running": { + "scheduler-threads": { "description": "The number of spawned worker threads\n\n", "format": "", "type": "integer" - }, - "working": { - "description": "The number of currently busy worker threads\n\n", - "format": "", - "type": "integer" } }, "type": "object", @@ -4393,7 +4388,7 @@ }, "/_admin/statistics": { "get": { - "description": "\n\nReturns the statistics information. The returned object contains the\nstatistics figures grouped together according to the description returned by\n*_admin/statistics-description*. For instance, to access a figure *userTime*\nfrom the group *system*, you first select the sub-object describing the\ngroup stored in *system* and in that sub-object the value for *userTime* is\nstored in the attribute of the same name.\n\nIn case of a distribution, the returned object contains the total count in\n*count* and the distribution list in *counts*. The sum (or total) of the\nindividual values is returned in *sum*.\n\n\n#### HTTP 200\n*A json document with these Properties is returned:*\n\nStatistics were returned successfully.\n\n- **code**: the HTTP status code - 200 in this case\n- **http**:\n - **requestsTotal**: total number of http requests\n - **requestsPatch**: No of requests using the PATCH-verb\n - **requestsPut**: No of requests using the PUT-verb\n - **requestsOther**: No of requests using the none of the above identified verbs\n - **requestsAsync**: total number of asynchroneous http requests\n - **requestsPost**: No of requests using the POST-verb\n - **requestsOptions**: No of requests using the OPTIONS-verb\n - **requestsHead**: No of requests using the HEAD-verb\n - **requestsGet**: No of requests using the GET-verb\n - **requestsDelete**: No of requests using the DELETE-verb\n- **errorMessage**: a descriptive error message\n- **enabled**: *true* if the server has the statistics module enabled. If not, don't expect any values.\n- **system**:\n - **minorPageFaults**: pagefaults\n - **majorPageFaults**: pagefaults\n - **userTime**: the user CPU time used by the server process\n - **systemTime**: the system CPU time used by the server process\n - **numberOfThreads**: the number of threads in the server\n - **virtualSize**: VSS of the process\n - **residentSize**: RSS of process\n - **residentSizePercent**: RSS of process in %\n- **server**:\n - **threads**:\n - **running**: The number of spawned worker threads\n - **queued**: The number of jobs queued up waiting for worker threads becomming available\n - **working**: The number of currently busy worker threads\n - **blocked**: The number of worker threads waiting for the availability of resources (like Collection locks)\n - **uptime**: time the server is up and running\n - **physicalMemory**: available physical memory on the server\n - **v8Context**:\n - **available**: the number of currently spawnen V8 contexts\n - **max**: the total number of V8 contexts we may spawn as configured by --javascript.v8-contexts\n - **busy**: the number of currently active V8 contexts\n - **dirty**: the number of contexts that were previously used, and should now be garbage collected before being re-used\n - **free**: the number of V8 contexts that are free to use\n- **client**:\n - **totalTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **bytesReceived**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **requestTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **connectionTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **queueTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **httpConnections**: the number of open http connections\n - **bytesSent**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **ioTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n- **error**: boolean flag to indicate whether an error occurred (*false* in this case)\n- **time**: the current server timestamp\n\n\n\n\n**Example:**\n \n\n
shell> curl --dump - http://localhost:8529/_admin/statistics\n\nHTTP/1.1 200 OK\ncontent-type: application/json; charset=utf-8\nx-content-type-options: nosniff\n\n{ \n  \"time\" : 1530713393.95138, \n  \"enabled\" : true, \n  \"system\" : { \n    \"minorPageFaults\" : 44055, \n    \"majorPageFaults\" : 3, \n    \"userTime\" : 5.53, \n    \"systemTime\" : 1.24, \n    \"numberOfThreads\" : 37, \n    \"residentSize\" : 322777088, \n    \"residentSizePercent\" : 0.00959099026490694, \n    \"virtualSize\" : 3732545536 \n  }, \n  \"client\" : { \n    \"httpConnections\" : 1, \n    \"connectionTime\" : { \n      \"sum\" : 0, \n      \"count\" : 0, \n      \"counts\" : [ \n        0, \n        0, \n        0, \n        0 \n      ] \n    }, \n    \"totalTime\" : { \n      \"sum\" : 19.510765552520752, \n      \"count\" : 5144, \n      \"counts\" : [ \n        4804, \n        231, \n        97, \n        10, \n        1, \n        1, \n        0 \n      ] \n    }, \n    \"requestTime\" : { \n      \"sum\" : 0.009275674819946289, \n      \"count\" : 5144, \n      \"counts\" : [ \n        5144, \n        0, \n        0, \n        0, \n        0, \n        0, \n        0 \n      ] \n    }, \n    \"queueTime\" : { \n      \"sum\" : 0.1816091537475586, \n      \"count\" : 3222, \n      \"counts\" : [ \n        3222, \n        0, \n        0, \n        0, \n        0, \n        0, \n        0 \n      ] \n    }, \n    \"ioTime\" : { \n      \"sum\" : 19.319880723953247, \n      \"count\" : 5144, \n      \"counts\" : [ \n        4804, \n        231, \n        97, \n        10, \n        1, \n        1, \n        0 \n      ] \n    }, \n    \"bytesSent\" : { \n      \"sum\" : 2337463, \n      \"count\" : 5144, \n      \"counts\" : [ \n        360, \n        4388, \n        323, \n        71, \n        2, \n        0 \n      ] \n    }, \n    \"bytesReceived\" : { \n      \"sum\" : 1113704, \n      \"count\" : 5144, \n      \"counts\" : [ \n        4587, \n        557, \n        0, \n        0, \n        0, \n        0 \n      ] \n    } \n  }, \n  \"http\" : { \n    \"requestsTotal\" : 5144, \n    \"requestsAsync\" : 0, \n    \"requestsGet\" : 1511, \n    \"requestsHead\" : 0, \n    \"requestsPost\" : 3343, \n    \"requestsPut\" : 78, \n    \"requestsPatch\" : 3, \n    \"requestsDelete\" : 209, \n    \"requestsOptions\" : 0, \n    \"requestsOther\" : 0 \n  }, \n  \"server\" : { \n    \"uptime\" : 25.155822038650513, \n    \"physicalMemory\" : 33654198272, \n    \"v8Context\" : { \n      \"available\" : 2, \n      \"busy\" : 1, \n      \"dirty\" : 0, \n      \"free\" : 1, \n      \"max\" : 16 \n    }, \n    \"threads\" : { \n      \"running\" : 4, \n      \"working\" : 2, \n      \"blocked\" : 0, \n      \"queued\" : 1 \n    } \n  }, \n  \"error\" : false, \n  \"code\" : 200 \n}\n
\n\n\n\n\n", + "description": "\n\nReturns the statistics information. The returned object contains the\nstatistics figures grouped together according to the description returned by\n*_admin/statistics-description*. For instance, to access a figure *userTime*\nfrom the group *system*, you first select the sub-object describing the\ngroup stored in *system* and in that sub-object the value for *userTime* is\nstored in the attribute of the same name.\n\nIn case of a distribution, the returned object contains the total count in\n*count* and the distribution list in *counts*. The sum (or total) of the\nindividual values is returned in *sum*.\n\n\n#### HTTP 200\n*A json document with these Properties is returned:*\n\nStatistics were returned successfully.\n\n- **code**: the HTTP status code - 200 in this case\n- **http**:\n - **requestsTotal**: total number of http requests\n - **requestsPatch**: No of requests using the PATCH-verb\n - **requestsPut**: No of requests using the PUT-verb\n - **requestsOther**: No of requests using the none of the above identified verbs\n - **requestsAsync**: total number of asynchroneous http requests\n - **requestsPost**: No of requests using the POST-verb\n - **requestsOptions**: No of requests using the OPTIONS-verb\n - **requestsHead**: No of requests using the HEAD-verb\n - **requestsGet**: No of requests using the GET-verb\n - **requestsDelete**: No of requests using the DELETE-verb\n- **errorMessage**: a descriptive error message\n- **enabled**: *true* if the server has the statistics module enabled. If not, don't expect any values.\n- **system**:\n - **minorPageFaults**: pagefaults\n - **majorPageFaults**: pagefaults\n - **userTime**: the user CPU time used by the server process\n - **systemTime**: the system CPU time used by the server process\n - **numberOfThreads**: the number of threads in the server\n - **virtualSize**: VSS of the process\n - **residentSize**: RSS of process\n - **residentSizePercent**: RSS of process in %\n- **server**:\n - **threads**:\n - **in-progress**: The number of currently busy worker threads\n - **scheduler-threads**: The number of spawned worker threads\n - **queued**: The number of jobs queued up waiting for worker threads becomming available\n - **uptime**: time the server is up and running\n - **physicalMemory**: available physical memory on the server\n - **v8Context**:\n - **available**: the number of currently spawnen V8 contexts\n - **max**: the total number of V8 contexts we may spawn as configured by --javascript.v8-contexts\n - **busy**: the number of currently active V8 contexts\n - **dirty**: the number of contexts that were previously used, and should now be garbage collected before being re-used\n - **free**: the number of V8 contexts that are free to use\n- **client**:\n - **totalTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **bytesReceived**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **requestTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **connectionTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **queueTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **httpConnections**: the number of open http connections\n - **bytesSent**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n - **ioTime**:\n - **count**: number of values sumarized\n - **sum**: sumarized value of all counts\n - **counts** (integer): array containing the values\n- **error**: boolean flag to indicate whether an error occurred (*false* in this case)\n- **time**: the current server timestamp\n\n\n\n\n**Example:**\n \n\n
shell> curl --dump - http://localhost:8529/_admin/statistics\n\nHTTP/1.1 200 OK\ncontent-type: application/json; charset=utf-8\nx-content-type-options: nosniff\n\n{ \n  \"time\" : 1530713393.95138, \n  \"enabled\" : true, \n  \"system\" : { \n    \"minorPageFaults\" : 44055, \n    \"majorPageFaults\" : 3, \n    \"userTime\" : 5.53, \n    \"systemTime\" : 1.24, \n    \"numberOfThreads\" : 37, \n    \"residentSize\" : 322777088, \n    \"residentSizePercent\" : 0.00959099026490694, \n    \"virtualSize\" : 3732545536 \n  }, \n  \"client\" : { \n    \"httpConnections\" : 1, \n    \"connectionTime\" : { \n      \"sum\" : 0, \n      \"count\" : 0, \n      \"counts\" : [ \n        0, \n        0, \n        0, \n        0 \n      ] \n    }, \n    \"totalTime\" : { \n      \"sum\" : 19.510765552520752, \n      \"count\" : 5144, \n      \"counts\" : [ \n        4804, \n        231, \n        97, \n        10, \n        1, \n        1, \n        0 \n      ] \n    }, \n    \"requestTime\" : { \n      \"sum\" : 0.009275674819946289, \n      \"count\" : 5144, \n      \"counts\" : [ \n        5144, \n        0, \n        0, \n        0, \n        0, \n        0, \n        0 \n      ] \n    }, \n    \"queueTime\" : { \n      \"sum\" : 0.1816091537475586, \n      \"count\" : 3222, \n      \"counts\" : [ \n        3222, \n        0, \n        0, \n        0, \n        0, \n        0, \n        0 \n      ] \n    }, \n    \"ioTime\" : { \n      \"sum\" : 19.319880723953247, \n      \"count\" : 5144, \n      \"counts\" : [ \n        4804, \n        231, \n        97, \n        10, \n        1, \n        1, \n        0 \n      ] \n    }, \n    \"bytesSent\" : { \n      \"sum\" : 2337463, \n      \"count\" : 5144, \n      \"counts\" : [ \n        360, \n        4388, \n        323, \n        71, \n        2, \n        0 \n      ] \n    }, \n    \"bytesReceived\" : { \n      \"sum\" : 1113704, \n      \"count\" : 5144, \n      \"counts\" : [ \n        4587, \n        557, \n        0, \n        0, \n        0, \n        0 \n      ] \n    } \n  }, \n  \"http\" : { \n    \"requestsTotal\" : 5144, \n    \"requestsAsync\" : 0, \n    \"requestsGet\" : 1511, \n    \"requestsHead\" : 0, \n    \"requestsPost\" : 3343, \n    \"requestsPut\" : 78, \n    \"requestsPatch\" : 3, \n    \"requestsDelete\" : 209, \n    \"requestsOptions\" : 0, \n    \"requestsOther\" : 0 \n  }, \n  \"server\" : { \n    \"uptime\" : 25.155822038650513, \n    \"physicalMemory\" : 33654198272, \n    \"v8Context\" : { \n      \"available\" : 2, \n      \"busy\" : 1, \n      \"dirty\" : 0, \n      \"free\" : 1, \n      \"max\" : 16 \n    }, \n    \"threads\" : { \n      \"running\" : 4, \n      \"working\" : 2, \n      \"blocked\" : 0, \n      \"queued\" : 1 \n    } \n  }, \n  \"error\" : false, \n  \"code\" : 200 \n}\n
\n\n\n\n\n", "parameters": [], "produces": [ "application/json" diff --git a/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html b/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html index 7d13b26a23..32dd7d0b72 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html +++ b/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html @@ -3499,4 +3499,4 @@ var cutByResolution = function (str) {
\ No newline at end of file + <% } %>
\ No newline at end of file diff --git a/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html.gz b/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html.gz index 959d8dd32a..85a3f48b9b 100644 Binary files a/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html.gz and b/js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html.gz differ